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>
---
 .../scenarios/availability/test_basemonitor.py     | 125 ---------------------
 1 file changed, 125 deletions(-)
 delete mode 100644 tests/unit/benchmark/scenarios/availability/test_basemonitor.py

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

diff --git a/tests/unit/benchmark/scenarios/availability/test_basemonitor.py b/tests/unit/benchmark/scenarios/availability/test_basemonitor.py
deleted file mode 100644
index 92ae8aa88..000000000
--- a/tests/unit/benchmark/scenarios/availability/test_basemonitor.py
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/usr/bin/env python
-
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# 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.monitor.monitor_command
-
-from __future__ import absolute_import
-import mock
-import unittest
-
-from yardstick.benchmark.scenarios.availability.monitor import basemonitor
-
-
-@mock.patch(
-    'yardstick.benchmark.scenarios.availability.monitor.basemonitor'
-    '.BaseMonitor')
-class MonitorMgrTestCase(unittest.TestCase):
-
-    def setUp(self):
-        self.monitor_configs = [
-            {
-                "monitor_type": "openstack-cmd",
-                "command_name": "openstack router list",
-                "monitor_time": 10,
-                "monitor_number": 3,
-                "sla": {
-                    "max_outage_time": 5
-                }
-            },
-            {
-                "monitor_type": "process",
-                "process_name": "neutron-server",
-                "host": "node1",
-                "monitor_time": 20,
-                "monitor_number": 3,
-                "sla": {
-                    "max_recover_time": 20
-                }
-            }
-        ]
-        self.MonitorMgr = basemonitor.MonitorMgr([])
-        self.MonitorMgr.init_monitors(self.monitor_configs, None)
-        self.monitor_list = self.MonitorMgr._monitor_list
-        for mo in self.monitor_list:
-            mo._result = {"outage_time": 10}
-
-    def test__MonitorMgr_setup_successful(self, mock_monitor):
-        instance = basemonitor.MonitorMgr({"nova-api": 10})
-        instance.init_monitors(self.monitor_configs, None)
-        instance.start_monitors()
-        instance.wait_monitors()
-
-        ret = instance.verify_SLA()
-
-    def test_MonitorMgr_getitem(self, mock_monitor):
-        monitorMgr = basemonitor.MonitorMgr({"nova-api": 10})
-        monitorMgr.init_monitors(self.monitor_configs, None)
-
-    def test_store_result(self, mock_monitor):
-        expect = {'process_neutron-server_outage_time': 10,
-                  'openstack-router-list_outage_time': 10}
-        result = {}
-        self.MonitorMgr.store_result(result)
-        self.assertDictEqual(result, expect)
-
-
-class BaseMonitorTestCase(unittest.TestCase):
-
-    class MonitorSimple(basemonitor.BaseMonitor):
-        __monitor_type__ = "MonitorForTest"
-
-        def setup(self):
-            self.monitor_result = False
-
-        def monitor_func(self):
-            return self.monitor_result
-
-    def setUp(self):
-        self.monitor_cfg = {
-            'monitor_type': 'MonitorForTest',
-            'command_name': 'nova image-list',
-            'monitor_time': 0.01,
-            'sla': {'max_outage_time': 5}
-        }
-
-    def test__basemonitor_start_wait_successful(self):
-        ins = basemonitor.BaseMonitor(self.monitor_cfg, None, {"nova-api": 10})
-        ins.start_monitor()
-        ins.wait_monitor()
-
-    def test__basemonitor_all_successful(self):
-        ins = self.MonitorSimple(self.monitor_cfg, None, {"nova-api": 10})
-        ins.setup()
-        ins.run()
-        ins.verify_SLA()
-
-    @mock.patch(
-        'yardstick.benchmark.scenarios.availability.monitor.basemonitor'
-        '.multiprocessing')
-    def test__basemonitor_func_false(self, mock_multiprocess):
-        ins = self.MonitorSimple(self.monitor_cfg, None, {"nova-api": 10})
-        ins.setup()
-        mock_multiprocess.Event().is_set.return_value = False
-        ins.run()
-        ins.verify_SLA()
-
-    def test__basemonitor_getmonitorcls_successfule(self):
-        cls = None
-        try:
-            cls = basemonitor.BaseMonitor.get_monitor_cls(self.monitor_cfg)
-        except Exception:
-            pass
-        self.assertIsNone(cls)
-
-
-if __name__ == "__main__":
-    unittest.main()
-- 
cgit 1.2.3-korg