From: Yu Yang (Gabriel) <Gabriel.yuyang@huawei.com>
Date: Wed, 29 Mar 2017 08:25:09 +0000 (+0000)
Subject: Merge "bugfix: bottlenecks devguide in docs.opnfv.org"
X-Git-Tag: opnfv-5.0.0~45
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=1897171f07dfa56baaee2b4e7fd358b1a15b7c0d;hp=3480c32bb5113a8a5f56b7e1db82c3a9236418fb;p=bottlenecks.git

Merge "bugfix: bottlenecks devguide in docs.opnfv.org"
---

diff --git a/cli/bottlenecks_cli.py b/cli/bottlenecks_cli.py
index ebbf05dc..01144cf2 100644
--- a/cli/bottlenecks_cli.py
+++ b/cli/bottlenecks_cli.py
@@ -46,9 +46,6 @@ def testcase_run(testname, noclean):
     _testcase.run('-c ' + testname, noclean)
 
 
-_teststory = Testcase()
-
-
 @main.group()
 @click.pass_context
 def teststory(ctx):
@@ -62,4 +59,4 @@ def teststory(ctx):
               help='Openstack resources created by the test'
               'will not be cleaned after the teststory execution.')
 def teststory_run(testname, noclean):
-    _testcase.run('-s ' + testname, noclean)
\ No newline at end of file
+    _testcase.run('-s ' + testname, noclean)
diff --git a/docker/docker_cleanup.sh b/docker/docker_cleanup.sh
index 9b7e87ab..243e72e5 100644
--- a/docker/docker_cleanup.sh
+++ b/docker/docker_cleanup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##############################################################################
-# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others.
+# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
diff --git a/run_tests.sh b/run_tests.sh
index 97cbf28c..eb788242 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -143,8 +143,6 @@ bash ${BASEDIR}/docker/docker_cleanup.sh -d kibana --debug
 bash ${BASEDIR}/docker/docker_cleanup.sh -d elasticsearch --debug
 bash ${BASEDIR}/docker/docker_cleanup.sh -d influxdb --debug
 
-exit 0
-
 #run tests
 if [ "${teststory}" != "" ]; then
     test_level="teststory"
diff --git a/utils/parser.py b/utils/parser.py
index b5f29679..48f705b0 100644
--- a/utils/parser.py
+++ b/utils/parser.py
@@ -53,7 +53,7 @@ class Parser():
         with open(story_dir) as file:
             story_parser = yaml.load(file)
         for case_name in story_parser['testcase']:
-            Parser.testcase_read(cls, testcase, case_name)
+            Parser.testcase_read(testcase, case_name)
 
         return cls.bottlenecks_test