diff options
| -rw-r--r-- | functest/core/robotframework.py | 6 | ||||
| -rw-r--r-- | functest/tests/unit/core/test_robotframework.py | 16 | ||||
| -rw-r--r-- | functest/tests/unit/odl/test_odl.py | 10 |
3 files changed, 20 insertions, 12 deletions
diff --git a/functest/core/robotframework.py b/functest/core/robotframework.py index 689d9d94..ccfa26b7 100644 --- a/functest/core/robotframework.py +++ b/functest/core/robotframework.py @@ -96,6 +96,7 @@ class RobotFramework(testcase.TestCase): try: suites = kwargs["suites"] variable = kwargs.get("variable", []) + variablefile = kwargs.get("variablefile", []) except KeyError: self.__logger.exception("Mandatory args were not passed") return self.EX_RUN_ERROR @@ -109,8 +110,9 @@ class RobotFramework(testcase.TestCase): self.__logger.exception("Cannot create %s", self.res_dir) return self.EX_RUN_ERROR stream = StringIO() - robot.run(*suites, variable=variable, output=self.xml_file, - log='NONE', report='NONE', stdout=stream) + robot.run(*suites, variable=variable, variablefile=variablefile, + output=self.xml_file, log='NONE', + report='NONE', stdout=stream) self.__logger.info("\n" + stream.getvalue()) self.__logger.info("Results were successfully generated") try: diff --git a/functest/tests/unit/core/test_robotframework.py b/functest/tests/unit/core/test_robotframework.py index 38e9039b..28fd15f6 100644 --- a/functest/tests/unit/core/test_robotframework.py +++ b/functest/tests/unit/core/test_robotframework.py @@ -117,6 +117,7 @@ class RunTesting(unittest.TestCase): suites = ["foo"] variable = [] + variablefile = [] def setUp(self): self.test = robotframework.RobotFramework( @@ -129,7 +130,9 @@ class RunTesting(unittest.TestCase): def _test_makedirs_exc(self, *args): with mock.patch.object(self.test, 'parse_results') as mock_method: self.assertEqual( - self.test.run(suites=self.suites, variable=self.variable), + self.test.run( + suites=self.suites, variable=self.variable, + variablefile=self.variablefile), self.test.EX_RUN_ERROR) args[0].assert_not_called() mock_method.asser_not_called() @@ -152,7 +155,8 @@ class RunTesting(unittest.TestCase): self.test.EX_OK) args[0].assert_called_once_with( *self.suites, log='NONE', output=self.test.xml_file, - report='NONE', stdout=mock.ANY, variable=self.variable) + report='NONE', stdout=mock.ANY, variable=self.variable, + variablefile=self.variablefile) mock_method.assert_called_once_with() @mock.patch('os.makedirs', side_effect=OSError(errno.EEXIST, '')) @@ -168,10 +172,14 @@ class RunTesting(unittest.TestCase): @mock.patch('robot.run') def _test_parse_results(self, status, *args): self.assertEqual( - self.test.run(suites=self.suites, variable=self.variable), status) + self.test.run( + suites=self.suites, variable=self.variable, + variablefile=self.variablefile), + status) args[0].assert_called_once_with( *self.suites, log='NONE', output=self.test.xml_file, - report='NONE', stdout=mock.ANY, variable=self.variable) + report='NONE', stdout=mock.ANY, variable=self.variable, + variablefile=self.variablefile) def test_parse_results_exc(self): with mock.patch.object(self.test, 'parse_results', 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) |