diff options
| author |   kubi <jean.gaoliang@huawei.com> | 2016-02-05 08:48:00 +0000 |
|---|---|---|
| committer |   Jörgen Karlsson <jorgen.w.karlsson@ericsson.com> | 2016-02-08 11:29:41 +0000 |
| commit | cde3f7882cc21af95a844f9c7b19795af84741d4 (patch) | |
| tree | 00e838aaa7fea414e9fed6347aa83f2cca2c41d8 /tests | |
| parent | 4be7c4c3960e941ce6fad82acd4572a5b96fb5c4 (diff) | |
add precondition check
as we discussed yersterday, for daily jenkins task,
i have a new idea, i add a precondition check and a key parameter in test case,
if environment info(eg. "DEPLOY_SCENARIO") meet the preconditon which was defined in test case ,
this test case will run, if not meet, this test case will skip.
and default is allow all test case to run, so this patch will not influence existing test case.
any comments are welcomed
Change-Id: I4300ac58994d51c0ddb4dd6d58b7191f796ddcee
Signed-off-by: kubi <jean.gaoliang@huawei.com>
(cherry picked from commit ff5cb9501b155e07fe75f03062217270b9745131)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/opnfv/test_cases/opnfv_yardstick_tc027.yaml | 3 | ||||
| -rw-r--r-- | tests/unit/cmd/commands/test_task.py | 14 |
2 files changed, 17 insertions, 0 deletions
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc027.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc027.yaml index e360b4bd0..cf3afc866 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc027.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc027.yaml @@ -24,6 +24,9 @@ scenarios: max_rtt: 30 action: monitor +precondition: + installer_type: compass + deploy_scenarios: os-nosdn context: type: Node diff --git a/tests/unit/cmd/commands/test_task.py b/tests/unit/cmd/commands/test_task.py index e785e99a9..5b404c48d 100644 --- a/tests/unit/cmd/commands/test_task.py +++ b/tests/unit/cmd/commands/test_task.py @@ -56,3 +56,17 @@ class TaskCommandsTestCase(unittest.TestCase): mock_base_runner.Runner.get.return_value = runner t._run([scenario], False, "yardstick.out") self.assertTrue(runner.run.called) + + @mock.patch('yardstick.cmd.commands.task.os') + def test_check_precondition(self, mock_os): + cfg = \ + {'precondition': + {'installer_type': 'compass', + 'deploy_scenarios': 'os-nosdn' + } + } + + t = task.TaskParser('/opt') + mock_os.environ.get.side_effect = ['compass', 'os-nosdn'] + result = t._check_precondition(cfg) + self.assertTrue(result) |