Merge "Remove mox/mox3 usage from test_quota"

neutronclient/tests/unit/test_cli20.py

@@ -170,6 +170,32 @@ class MyComparator(mox.Comparator):
         return str(self.lhs)
 
 
+class ContainsKeyValue(object):
+    """Checks whether key/value pair(s) are included in a dict parameter.
+
+    This class just checks whether specifid key/value pairs passed in
+    __init__() are included in a dict parameter. The comparison does not
+    fail even if other key/value pair(s) exists in a target dict.
+    """
+
+    def __init__(self, expected):
+        self._expected = expected
+
+    def __eq__(self, other):
+        if not isinstance(other, dict):
+            return False
+        for key, value in self._expected.items():
+            if key not in other:
+                return False
+            if other[key] != value:
+                return False
+        return True
+
+    def __repr__(self):
+        return ('<%s (expected: %s)>' %
+                (self.__class__.__name__, self._expected))
+
+
 class CLITestV20Base(base.BaseTestCase):
 
     test_id = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'

neutronclient/tests/unit/test_quota.py

@@ -16,7 +16,7 @@
 
 import sys
 
-from mox3 import mox
+import mock
 
 from neutronclient.common import exceptions
 from neutronclient.neutron.v2_0 import quota as test_quota
@@ -67,26 +67,24 @@ class CLITestV20Quota(test_cli20.CLITestV20Base):
         cmd = test_quota.ShowQuotaDefault(
             test_cli20.MyApp(sys.stdout), None)
         args = ['--tenant-id', self.test_id]
-        self.mox.StubOutWithMock(cmd, "get_client")
-        self.mox.StubOutWithMock(self.client.httpclient, "request")
-        cmd.get_client().MultipleTimes().AndReturn(self.client)
         expected_res = {'quota': {'port': 50, 'network': 10, 'subnet': 10}}
         resstr = self.client.serialize(expected_res)
         path = getattr(self.client, "quota_default_path")
         return_tup = (test_cli20.MyResp(200), resstr)
-        self.client.httpclient.request(
-            test_cli20.end_url(path % self.test_id), 'GET',
-            body=None,
-            headers=mox.ContainsKeyValue(
-                'X-Auth-Token', test_cli20.TOKEN)).AndReturn(return_tup)
-        self.mox.ReplayAll()
-
+        with mock.patch.object(cmd, 'get_client',
+                               return_value=self.client) as mock_get_client, \
+                mock.patch.object(self.client.httpclient, 'request',
+                                  return_value=return_tup) as mock_request:
             cmd_parser = cmd.get_parser("test_" + resource)
             parsed_args = cmd_parser.parse_args(args)
             cmd.run(parsed_args)
 
-        self.mox.VerifyAll()
-        self.mox.UnsetStubs()
+        mock_get_client.assert_called_once_with()
+        mock_request.assert_called_once_with(
+            test_cli20.end_url(path % self.test_id), 'GET',
+            body=None,
+            headers=test_cli20.ContainsKeyValue(
+                {'X-Auth-Token': test_cli20.TOKEN}))
         _str = self.fake_stdout.make_string()
         self.assertIn('network', _str)
         self.assertIn('subnet', _str)