Merge "tests: Remove references to soft_lock"

2 files changed, 0 insertions, 30 deletions

diff --git a/test/unit/__init__.py b/test/unit/__init__.py
index e57b57453..4a9dcbef5 100644
--- a/test/unit/__init__.py
+++ b/test/unit/__init__.py
@@ -462,10 +462,6 @@ class FakeMemcache(object):
     def decr(self, key, delta=1, time=0):
         return self.incr(key, delta=-delta, time=time)
 
-    @contextmanager
-    def soft_lock(self, key, timeout=0, retries=5):
-        yield True
-
     @track
     def delete(self, key):
         try:
diff --git a/test/unit/proxy/test_server.py b/test/unit/proxy/test_server.py
index 83f3acb88..c81074e9b 100644
--- a/test/unit/proxy/test_server.py
+++ b/test/unit/proxy/test_server.py
@@ -9904,32 +9904,6 @@ class TestContainerController(unittest.TestCase):
                 resp = getattr(controller, meth)(req)
                 self.assertEqual(resp.status_int, 404)
 
-    def test_put_locking(self):
-
-        class MockMemcache(FakeMemcache):
-
-            def __init__(self, allow_lock=None):
-                self.allow_lock = allow_lock
-                super(MockMemcache, self).__init__()
-
-            @contextmanager
-            def soft_lock(self, key, timeout=0, retries=5):
-                if self.allow_lock:
-                    yield True
-                else:
-                    raise NotImplementedError
-
-        with save_globals():
-            controller = proxy_server.ContainerController(self.app, 'account',
-                                                          'container')
-            self.app.memcache = MockMemcache(allow_lock=True)
-            set_http_connect(200, 201, 201, 201,
-                             missing_container=True)
-            req = Request.blank('/v1/a/c', environ={'REQUEST_METHOD': 'PUT'})
-            self.app.update_request(req)
-            res = controller.PUT(req)
-            self.assertEqual(res.status_int, 201)
-
     def test_error_limiting(self):
         with save_globals():
             controller = proxy_server.ContainerController(self.app, 'account',