test: replace testtools for unittest to make tests work

Author: aidaph

caso/tests/base.py

@@ -24,14 +24,14 @@
 from oslo_config import cfg
 from oslo_config import fixture as config_fixture
 import six
-import testtools
+import unittest
 
 CONF = cfg.CONF
 
 _TRUE_VALUES = ("True", "true", "1", "yes")
 
 
-class TestCase(testtools.TestCase):
+class TestCase(unittest.TestCase):
     """Test case base class for all unit tests."""
 
     REQUIRES_LOCKING = False

caso/tests/extract/test_manager.py

@@ -19,14 +19,17 @@
 
 import dateutil.parser
 from dateutil import tz
-import mock
+from oslo_config import cfg
 import six
+import unittest
+from unittest import mock
 
 from caso.extract import manager
 from caso.tests import base
 
+CONF = cfg.CONF
 
-class TestCasoManager(base.TestCase):
+class TestCasoManager(unittest.TestCase):
     """Test case for the cASO extractor manager."""
 
     def setUp(self):
@@ -63,6 +66,7 @@ def test_extract_empty_projects(self):
         self.assertFalse(self.m_extractor.extract.called)
         self.assertEqual(ret, [])
 
+
     def test_extract(self):
         """Test that we extract records for a given project."""
         self.flags(dry_run=True)
@@ -75,7 +79,7 @@ def test_extract(self):
         ret = self.manager.get_records()
         self.m_extractor.assert_called_once_with(
             "bazonk",
-            mock.ANY,
+            unittest.mock.ANY,
         )
         self.m_extractor.return_value.extract.assert_called_once_with(
             dateutil.parser.parse(extract_from).replace(tzinfo=tz.tzutc()),
@@ -102,15 +106,15 @@ def test_get_records_with_lastrun(self):
         extract_to = "2015-12-19"
         self.flags(extract_to=extract_to)
 
-        with mock.patch.object(self.manager, "get_lastrun") as m:
+        with unittest.mock.patch.object(self.manager, "get_lastrun") as m:
             m.return_value = lastrun
 
             ret = self.manager.get_records()
 
             m.assert_called_once_with("bazonk")
             self.m_extractor.assert_called_once_with(
                 "bazonk",
-                mock.ANY,
+                unittest.mock.ANY,
             )
             self.m_extractor.return_value.extract.assert_called_once_with(
                 dateutil.parser.parse(lastrun).replace(tzinfo=tz.tzutc()),
@@ -126,9 +130,9 @@ def test_lastrun_exists(self):
         else:
             builtins_open = "__builtin__.open"
 
-        fopen = mock.mock_open(read_data=str(expected))
-        with mock.patch("os.path.exists") as path:
-            with mock.patch(builtins_open, fopen):
+        fopen = unittest.mock.mock_open(read_data=str(expected))
+        with unittest.mock.patch("os.path.exists") as path:
+            with unittest.mock.patch(builtins_open, fopen):
                 path.return_value = True
                 self.assertEqual(expected, self.manager.get_lastrun("foo"))
 
@@ -138,9 +142,9 @@ def test_lastrun_is_invalid(self):
             builtins_open = "builtins.open"
         else:
             builtins_open = "__builtin__.open"
-        fopen = mock.mock_open(read_data="foo")
-        with mock.patch("os.path.exists") as path:
-            with mock.patch(builtins_open, fopen):
+        fopen = unittest.mock.mock_open(read_data="foo")
+        with unittest.mock.patch("os.path.exists") as path:
+            with unittest.mock.patch(builtins_open, fopen):
                 path.return_value = True
                 self.assertRaises(ValueError, self.manager.get_lastrun, "foo")
 
@@ -149,7 +153,7 @@ def test_write_lastrun_dry_run(self):
         self.flags(dry_run=True)
         self.flags(projects=["bazonk"])
 
-        with mock.patch.object(self.manager, "write_lastrun") as m:
+        with unittest.mock.patch.object(self.manager, "write_lastrun") as m:
             self.manager.get_records()
             m.assert_called_once_with("bazonk")
 
@@ -161,6 +165,16 @@ def test_write_lastrun(self):
         else:
             builtins_open = "__builtin__.open"
 
-        with mock.patch(builtins_open, mock.mock_open()) as m:
+        with unittest.mock.patch(builtins_open, unittest.mock.mock_open()) as m:
             self.manager.get_records()
             m.assert_called_once_with("/var/spool/caso/lastrun.bazonk", "w")
+
+    def flags(self, **kw):
+        """Override flag variables for a test."""
+        group = kw.pop("group", None)
+        for k, v in six.iteritems(kw):
+            CONF.set_override(k, v, group)
+
+    def reset_flags(self):
+        """Reset flags."""
+        CONF.reset()

caso/tests/extract/test_nova.py

@@ -15,10 +15,12 @@
 """Tests for the OpenStack nova extractor."""
 
 from caso.extract.openstack import nova
+from caso.extract import manager
 from caso.tests import base
 
+import unittest
 
-class TestCasoManager(base.TestCase):
+class TestCasoManager(unittest.TestCase):
     """Test case for Nova extractor."""
 
     def setUp(self):

caso/tests/test_manager.py

@@ -14,19 +14,19 @@
 
 """Tests for `caso.manager` module."""
 
-import mock
+from unittest.mock import patch 
 from oslo_concurrency.fixture import lockutils as lock_fixture
 import six
+import unittest
+from unittest import mock
 
 from caso import manager
 from caso.tests import base
 
 
-class TestCasoManager(base.TestCase):
+class TestCasoManager(unittest.TestCase):
     """Test case for the cASO Manager."""
 
-    REQUIRES_LOCKING = True
-
     def setUp(self):
         """Set global test fixtures and mocks."""
         self.useFixture(lock_fixture.ExternalLockFixture())
@@ -48,3 +48,4 @@ def tearDown(self):
             p.stop()
 
         super(TestCasoManager, self).tearDown()
+