summaryrefslogtreecommitdiff
path: root/testing
diff options
context:
space:
mode:
Diffstat (limited to 'testing')
-rw-r--r--testing/tests/blobs/test_blob_manager.py5
-rw-r--r--testing/tests/blobs/test_sqlcipher_client_backend.py2
2 files changed, 4 insertions, 3 deletions
diff --git a/testing/tests/blobs/test_blob_manager.py b/testing/tests/blobs/test_blob_manager.py
index 56bea87a..3f0bf8c4 100644
--- a/testing/tests/blobs/test_blob_manager.py
+++ b/testing/tests/blobs/test_blob_manager.py
@@ -50,7 +50,7 @@ class BlobManagerTestCase(unittest.TestCase):
bad_blob_id = 'inexsistent_id'
result = yield self.manager.get(bad_blob_id)
self.assertIsNone(result)
- args = bad_blob_id, None
+ args = bad_blob_id, 'default'
self.manager._download_and_decrypt.assert_called_once_with(*args)
@defer.inlineCallbacks
@@ -143,4 +143,5 @@ class BlobManagerTestCase(unittest.TestCase):
yield self.manager.delete(blob_id)
local_list = yield self.manager.local_list()
self.assertEquals(0, len(local_list))
- self.manager._delete_from_remote.assert_called_with(blob_id)
+ params = {'namespace': 'default'}
+ self.manager._delete_from_remote.assert_called_with(blob_id, **params)
diff --git a/testing/tests/blobs/test_sqlcipher_client_backend.py b/testing/tests/blobs/test_sqlcipher_client_backend.py
index b67215e8..6193b486 100644
--- a/testing/tests/blobs/test_sqlcipher_client_backend.py
+++ b/testing/tests/blobs/test_sqlcipher_client_backend.py
@@ -71,4 +71,4 @@ class SQLBackendTestCase(unittest.TestCase):
len(content)))
yield defer.gatherResults(deferreds)
result = yield self.local.list()
- self.assertEquals(blob_ids, result)
+ self.assertEquals(set(blob_ids), set(result))