From ba4e9e6e47bd10ecc803bab920178ea973c2fa86 Mon Sep 17 00:00:00 2001
From: Emma Foley <emma.l.foley@intel.com>
Date: Wed, 29 Nov 2017 22:56:21 +0000
Subject: Move tests: unit/benchmark

* Fix pylint errors
* Add TODOs

Some errors are ignored locally, as they were a symptom of other problems.
These issues have been flagged with a TODO, and should be fixed later.

Change-Id: I30eb4b0aafe0575d0cddbc946108291f21a98ed8
Jira: YARDSTICK-837
Signed-off-by: Emma Foley <emma.l.foley@intel.com>
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
---
 .../availability/test_scenario_general.py          | 71 ----------------------
 1 file changed, 71 deletions(-)
 delete mode 100644 tests/unit/benchmark/scenarios/availability/test_scenario_general.py

(limited to 'tests/unit/benchmark/scenarios/availability/test_scenario_general.py')

diff --git a/tests/unit/benchmark/scenarios/availability/test_scenario_general.py b/tests/unit/benchmark/scenarios/availability/test_scenario_general.py
deleted file mode 100644
index 244a5e798..000000000
--- a/tests/unit/benchmark/scenarios/availability/test_scenario_general.py
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/env python
-
-##############################################################################
-# Copyright (c) 2016 Huan Li and others
-# lihuansse@tongji.edu.cn
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-# Unittest for yardstick.benchmark.scenarios.availability.scenario_general
-
-from __future__ import absolute_import
-import mock
-import unittest
-
-from yardstick.benchmark.scenarios.availability.scenario_general import \
-    ScenarioGeneral
-
-
-@mock.patch(
-    'yardstick.benchmark.scenarios.availability.scenario_general.Director')
-class ScenarioGeneralTestCase(unittest.TestCase):
-
-    def setUp(self):
-        self.scenario_cfg = {
-            'type': "general_scenario",
-            'options': {
-                'attackers': [{
-                    'fault_type': "general-attacker",
-                    'key': "kill-process"}],
-                'monitors': [{
-                    'monitor_type': "general-monitor",
-                    'key': "service-status"}],
-                'steps': [
-                    {
-                        'actionKey': "kill-process",
-                        'actionType': "attacker",
-                        'index': 1},
-                    {
-                        'actionKey': "service-status",
-                        'actionType': "monitor",
-                        'index': 2}]
-            }
-        }
-
-    def test_scenario_general_all_successful(self, mock_director):
-        ins = ScenarioGeneral(self.scenario_cfg, None)
-        ins.setup()
-        ins.run({})
-        ins.teardown()
-
-    def test_scenario_general_exception(self, mock_director):
-        ins = ScenarioGeneral(self.scenario_cfg, None)
-        mock_obj = mock.Mock()
-        mock_obj.createActionPlayer.side_effect = KeyError('Wrong')
-        ins.director = mock_obj
-        ins.director.data = {}
-        ins.run({})
-        ins.teardown()
-
-    def test_scenario_general_case_fail(self, mock_director):
-        ins = ScenarioGeneral(self.scenario_cfg, None)
-        mock_obj = mock.Mock()
-        mock_obj.verify.return_value = False
-        ins.director = mock_obj
-        ins.director.data = {}
-        ins.run({})
-        ins.pass_flag = True
-        ins.teardown()
-- 
cgit 1.2.3-korg