ZO-4267: Rm rebase artefact

core/src/zeit/connector/connector.py

@@ -410,7 +410,6 @@ def unlock(self, id):
     def _unlock(self, id, locktoken):
         url = self._id2loc(self._get_cannonical_id(id))
         self.get_connection().unlock(url, locktoken)
-        self._invalidate_cache(id)
 
     def locked(self, id):
         id = self._get_cannonical_id(id)

core/src/zeit/connector/testing.py

@@ -82,7 +82,11 @@ def wait_for_http(self, url, timeout=10, sleep=0.2):
     def recursive_cleanup(self, uid_in):
         connector = self['connector']
         for _name, uid in connector.listCollection(uid_in):
-            connector.unlock(uid)
+            # unlock every resource, no matter the user
+            davlock = connector._get_dav_lock(uid)
+            if davlock:
+                connector._unlock(uid, davlock.get('locktoken'))
+                connector._invalidate_cache(uid)
             if connector[uid].type == 'folder':
                 self.recursive_cleanup(uid)
             del connector[uid]

core/src/zeit/connector/tests/test_contract.py

@@ -282,12 +282,10 @@ def test_unlock_removes_lock(self):
 
     def test_unlock_for_unknown_user_raises(self):
         id = self.add_resource('foo').id
-        token = self.connector.lock(id, 'external', datetime.now(pytz.UTC) + timedelta(hours=2))
+        self.connector.lock(id, 'external', datetime.now(pytz.UTC) + timedelta(hours=2))
         transaction.commit()
         with self.assertRaises(LockedByOtherSystemError):
             self.connector.unlock(id)
-        self.connector._unlock(id, token)
-        self.assertEqual((None, None, False), self.connector.locked(id))
 
     def test_locking_already_locked_resource_by_same_user_raises(self):
         id = self.add_resource('foo').id