Code Review
/
functest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Define create_snapshot() and clean() in TestCase"
[functest.git]
/
functest
/
opnfv_tests
/
openstack
/
tempest
/
tempest.py
diff --git
a/functest/opnfv_tests/openstack/tempest/tempest.py
b/functest/opnfv_tests/openstack/tempest/tempest.py
index
a41d07c
..
cb8e9b4
100644
(file)
--- a/
functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/
functest/opnfv_tests/openstack/tempest/tempest.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/
env
python
#
# Copyright (c) 2015 All rights reserved
# This program and the accompanying materials
#
# Copyright (c) 2015 All rights reserved
# This program and the accompanying materials
@@
-28,7
+28,7
@@
import functest.utils.functest_utils as ft_utils
logger = logging.getLogger(__name__)
logger = logging.getLogger(__name__)
-class TempestCommon(testcase.TestCase):
+class TempestCommon(testcase.
OSGC
TestCase):
def __init__(self, **kwargs):
super(TempestCommon, self).__init__(**kwargs)
def __init__(self, **kwargs):
super(TempestCommon, self).__init__(**kwargs)
@@
-81,8
+81,8
@@
class TempestCommon(testcase.TestCase):
result_file = open(conf_utils.TEMPEST_LIST, 'w')
black_tests = []
try:
result_file = open(conf_utils.TEMPEST_LIST, 'w')
black_tests = []
try:
- installer_type = CONST.
INSTALLER_TYPE
- deploy_scenario = CONST.
DEPLOY_SCENARIO
+ installer_type = CONST.
__getattribute__('INSTALLER_TYPE')
+ deploy_scenario = CONST.
__getattribute__('DEPLOY_SCENARIO')
if (bool(installer_type) * bool(deploy_scenario)):
# if INSTALLER_TYPE and DEPLOY_SCENARIO are set we read the
# file
if (bool(installer_type) * bool(deploy_scenario)):
# if INSTALLER_TYPE and DEPLOY_SCENARIO are set we read the
# file
@@
-119,9
+119,9
@@
class TempestCommon(testcase.TestCase):
header = ("Tempest environment:\n"
" SUT: %s\n Scenario: %s\n Node: %s\n Date: %s\n" %
header = ("Tempest environment:\n"
" SUT: %s\n Scenario: %s\n Node: %s\n Date: %s\n" %
- (CONST.
INSTALLER_TYPE
,
- CONST.
DEPLOY_SCENARIO
,
- CONST.
NODE_NAME
,
+ (CONST.
__getattribute__('INSTALLER_TYPE')
,
+ CONST.
__getattribute__('DEPLOY_SCENARIO')
,
+ CONST.
__getattribute__('NODE_NAME')
,
time.strftime("%a %b %d %H:%M:%S %Z %Y")))
f_stdout = open(
time.strftime("%a %b %d %H:%M:%S %Z %Y")))
f_stdout = open(
@@
-148,7
+148,7
@@
class TempestCommon(testcase.TestCase):
first_pos = line.index("UUID=") + len("UUID=")
last_pos = line.index(") for deployment")
self.VERIFICATION_ID = line[first_pos:last_pos]
first_pos = line.index("UUID=") + len("UUID=")
last_pos = line.index(") for deployment")
self.VERIFICATION_ID = line[first_pos:last_pos]
- logger.debug('Veri
cation UUID: %s' %
self.VERIFICATION_ID)
+ logger.debug('Veri
fication UUID: %s',
self.VERIFICATION_ID)
f_stdout.write(line)
p.wait()
f_stdout.write(line)
p.wait()
@@
-273,7
+273,8
@@
class TempestMultisite(TempestCommon):
TempestCommon.__init__(self, **kwargs)
self.MODE = "feature_multisite"
self.OPTION = "--concurrency 1"
TempestCommon.__init__(self, **kwargs)
self.MODE = "feature_multisite"
self.OPTION = "--concurrency 1"
- conf_utils.install_verifier_ext(CONST.dir_repo_kingbird)
+ conf_utils.install_verifier_ext(
+ CONST.__getattribute__('dir_repo_kingbird'))
class TempestCustom(TempestCommon):
class TempestCustom(TempestCommon):