bugfix: fix bugs for running 'teststory run'

JIRA: BOTTLENECK-144

utils/parser.py:56 has incorrect var:cls which cause pass more
var to testcase_read function.

Change-Id: I2d4b93f95d19a205e537515529746f6d9e13fe2c
Signed-off-by: yuyang <Gabriel.yuyang@huawei.com>

diff --git a/cli/bottlenecks_cli.py b/cli/bottlenecks_cli.py
index ebbf05d..01144cf 100644 (file)
--- 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 9b7e87a..243e72e 100644 (file)
--- 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 97cbf28..eb78824 100755 (executable)
--- 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 b5f2967..48f705b 100644 (file)
--- 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