Merge "Convert test_object to use .register_uris"

2017-02-17 15:21:27 +00:00 · 2017-02-17 15:21:27 +00:00 · b06b1fff9b
commit b06b1fff9b
parent 844ec53ad0 80709fd9a4
2 changed files with 489 additions and 512 deletions
--- a/shade/tests/unit/base.py
+++ b/shade/tests/unit/base.py
@ -425,10 +425,6 @@ class RequestsMockTestCase(BaseTestCase):
                mock_method, mock_uri, params['response_list'],
                **params['kw_params'])

-    def register_uri(self, method, uri, **kwargs):
-        self.__do_register_uris([
-            dict(method=method, uri=uri, **kwargs)])
-
    def assert_calls(self, stop_after=None):
        for (x, (call, history)) in enumerate(
                zip(self.calls, self.adapter.request_history)):
--- a/shade/tests/unit/test_object.py
+++ b/shade/tests/unit/test_object.py