aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormrichomme <morgan.richomme@orange.com>2018-03-08 16:23:38 +0100
committermrichomme <morgan.richomme@orange.com>2018-03-08 16:24:25 +0100
commita04a201551fadc5bc130a9037b100c0e18f3c043 (patch)
tree4691c6ddb451b2fba62af255c0f5afe4ac4abba6
parenta5c84f76643cce4193edec85367b11e1cca53a35 (diff)
Add tags support using include options
Change-Id: Ibfd8645e2ec7da7d05ae806b5bc1f5a90bfc39a2 Signed-off-by: mrichomme <morgan.richomme@orange.com>
-rw-r--r--xtesting/core/robotframework.py3
-rw-r--r--xtesting/tests/unit/core/test_robotframework.py9
2 files changed, 7 insertions, 5 deletions
diff --git a/xtesting/core/robotframework.py b/xtesting/core/robotframework.py
index cc6020a2..007b9629 100644
--- a/xtesting/core/robotframework.py
+++ b/xtesting/core/robotframework.py
@@ -96,6 +96,7 @@ class RobotFramework(testcase.TestCase):
suites = kwargs["suites"]
variable = kwargs.get("variable", [])
variablefile = kwargs.get("variablefile", [])
+ include = kwargs.get("include", [])
except KeyError:
self.__logger.exception("Mandatory args were not passed")
return self.EX_RUN_ERROR
@@ -110,7 +111,7 @@ class RobotFramework(testcase.TestCase):
return self.EX_RUN_ERROR
stream = StringIO()
robot.run(*suites, variable=variable, variablefile=variablefile,
- output=self.xml_file, log='NONE',
+ include=include, output=self.xml_file, log='NONE',
report='NONE', stdout=stream)
self.__logger.info("\n" + stream.getvalue())
self.__logger.info("Results were successfully generated")
diff --git a/xtesting/tests/unit/core/test_robotframework.py b/xtesting/tests/unit/core/test_robotframework.py
index 93111f38..e01ada21 100644
--- a/xtesting/tests/unit/core/test_robotframework.py
+++ b/xtesting/tests/unit/core/test_robotframework.py
@@ -118,6 +118,7 @@ class RunTesting(unittest.TestCase):
suites = ["foo"]
variable = []
variablefile = []
+ include = []
def setUp(self):
self.test = robotframework.RobotFramework(
@@ -132,7 +133,7 @@ class RunTesting(unittest.TestCase):
self.assertEqual(
self.test.run(
suites=self.suites, variable=self.variable,
- variablefile=self.variablefile),
+ variablefile=self.variablefile, include=self.include),
self.test.EX_RUN_ERROR)
args[0].assert_not_called()
mock_method.asser_not_called()
@@ -156,7 +157,7 @@ class RunTesting(unittest.TestCase):
args[0].assert_called_once_with(
*self.suites, log='NONE', output=self.test.xml_file,
report='NONE', stdout=mock.ANY, variable=self.variable,
- variablefile=self.variablefile)
+ variablefile=self.variablefile, include=self.include)
mock_method.assert_called_once_with()
@mock.patch('os.makedirs', side_effect=OSError(errno.EEXIST, ''))
@@ -175,12 +176,12 @@ class RunTesting(unittest.TestCase):
self.assertEqual(
self.test.run(
suites=self.suites, variable=self.variable,
- variablefile=self.variablefile),
+ variablefile=self.variablefile, include=self.include),
status)
args[0].assert_called_once_with(
*self.suites, log='NONE', output=self.test.xml_file,
report='NONE', stdout=mock.ANY, variable=self.variable,
- variablefile=self.variablefile)
+ variablefile=self.variablefile, include=self.include)
args[1].assert_called_once_with(self.test.res_dir)
def test_parse_results_exc(self):