aboutsummaryrefslogtreecommitdiffstats
path: root/functest/tests/unit/odl
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-02-07 16:08:05 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2018-02-07 19:42:53 +0100
commit89bb80232f777b0619d4168b292338c16a0a704c (patch)
tree8f98894f4727bea60f527f915caef52b7cbf4f1a /functest/tests/unit/odl
parente29b1236a4bacc94fd6d13a1744d7979d31a6ed6 (diff)
Add variablefile as possible robot.run() args
Change-Id: Ic80840957b4d9c3c4a1615696a2851f3f5bf7bf4 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/tests/unit/odl')
-rw-r--r--functest/tests/unit/odl/test_odl.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py
index 1a3f7950..b93ad313 100644
--- a/functest/tests/unit/odl/test_odl.py
+++ b/functest/tests/unit/odl/test_odl.py
@@ -153,7 +153,7 @@ class ODLMainTesting(ODLTesting):
def _test_run_suites(self, status, *args):
kwargs = self._get_run_suites_kwargs()
self.assertEqual(self.test.run_suites(**kwargs), status)
- if len(args) > 0:
+ if args:
args[0].assert_called_once_with(self.test.odl_variables_file)
if len(args) > 1:
variable = [
@@ -171,13 +171,11 @@ class ODLMainTesting(ODLTesting):
'PORT:{}'.format(self._odl_webport),
'RESTCONFPORT:{}'.format(self._odl_restconfport)]
args[1].assert_called_once_with(
- odl.ODLTests.basic_suite_dir,
- odl.ODLTests.neutron_suite_dir,
+ odl.ODLTests.basic_suite_dir, odl.ODLTests.neutron_suite_dir,
log='NONE',
output=os.path.join(self.test.res_dir, 'output.xml'),
- report='NONE',
- stdout=mock.ANY,
- variable=variable)
+ report='NONE', stdout=mock.ANY, variable=variable,
+ variablefile=[])
def _test_no_keyword(self, key):
kwargs = self._get_run_suites_kwargs(key)