summaryrefslogtreecommitdiff
path: root/testing
diff options
context:
space:
mode:
Diffstat (limited to 'testing')
-rw-r--r--testing/tests/blobs/test_blob_manager.py22
-rw-r--r--testing/tests/blobs/test_sqlcipher_client_backend.py19
-rw-r--r--testing/tests/server/test_blobs_server.py42
3 files changed, 43 insertions, 40 deletions
diff --git a/testing/tests/blobs/test_blob_manager.py b/testing/tests/blobs/test_blob_manager.py
index dd57047d..7d985768 100644
--- a/testing/tests/blobs/test_blob_manager.py
+++ b/testing/tests/blobs/test_blob_manager.py
@@ -42,17 +42,17 @@ class BlobManagerTestCase(unittest.TestCase):
self.manager = BlobManager(
self.tempdir, '',
'A' * 32, self.secret,
- 'uuid', 'token', None)
+ uuid4().hex, 'token', None)
self.addCleanup(self.manager.close)
@defer.inlineCallbacks
@pytest.mark.usefixtures("method_tmpdir")
- def test_get_inexistent(self):
+ def test_get_missing(self):
self.manager._download_and_decrypt = Mock(return_value=None)
- bad_blob_id = 'inexsistent_id'
- result = yield self.manager.get(bad_blob_id)
+ missing_blob_id = uuid4().hex
+ result = yield self.manager.get(missing_blob_id)
self.assertIsNone(result)
- args = bad_blob_id, ''
+ args = missing_blob_id, ''
self.manager._download_and_decrypt.assert_called_once_with(*args)
@defer.inlineCallbacks
@@ -109,26 +109,26 @@ class BlobManagerTestCase(unittest.TestCase):
@defer.inlineCallbacks
@pytest.mark.usefixtures("method_tmpdir")
def test_send_missing(self):
- fd = BytesIO('test')
+ fd, missing_id = BytesIO('test'), uuid4().hex
self.manager._encrypt_and_upload = Mock(return_value=None)
self.manager.remote_list = Mock(return_value=[])
- yield self.manager.local.put('missing_id', fd, 4)
+ yield self.manager.local.put(missing_id, fd, 4)
yield self.manager.send_missing()
call_list = self.manager._encrypt_and_upload.call_args_list
self.assertEquals(1, len(call_list))
call_blob_id, call_fd = call_list[0][0]
- self.assertEquals('missing_id', call_blob_id)
+ self.assertEquals(missing_id, call_blob_id)
self.assertEquals('test', call_fd.getvalue())
@defer.inlineCallbacks
@pytest.mark.usefixtures("method_tmpdir")
def test_duplicated_blob_error_on_put(self):
self.manager._encrypt_and_upload = Mock(return_value=None)
- content = "Blob content"
- doc1 = BlobDoc(BytesIO(content), 'existing_id')
+ content, existing_id = "Blob content", uuid4().hex
+ doc1 = BlobDoc(BytesIO(content), existing_id)
yield self.manager.put(doc1, len(content))
- doc2 = BlobDoc(BytesIO(content), 'existing_id')
+ doc2 = BlobDoc(BytesIO(content), existing_id)
self.manager._encrypt_and_upload.reset_mock()
with pytest.raises(BlobAlreadyExistsError):
yield self.manager.put(doc2, len(content))
diff --git a/testing/tests/blobs/test_sqlcipher_client_backend.py b/testing/tests/blobs/test_sqlcipher_client_backend.py
index 6193b486..daf561c7 100644
--- a/testing/tests/blobs/test_sqlcipher_client_backend.py
+++ b/testing/tests/blobs/test_sqlcipher_client_backend.py
@@ -21,6 +21,7 @@ from twisted.trial import unittest
from twisted.internet import defer
from leap.soledad.client._db.blobs import SQLiteBlobBackend
from io import BytesIO
+from uuid import uuid4
import pytest
@@ -34,7 +35,7 @@ class SQLBackendTestCase(unittest.TestCase):
@defer.inlineCallbacks
@pytest.mark.usefixtures("method_tmpdir")
def test_get_inexisting(self):
- bad_blob_id = 'inexsisting_id'
+ bad_blob_id = uuid4().hex
self.assertFalse((yield self.local.exists(bad_blob_id)))
result = yield self.local.get(bad_blob_id)
self.assertIsNone(result)
@@ -42,7 +43,7 @@ class SQLBackendTestCase(unittest.TestCase):
@defer.inlineCallbacks
@pytest.mark.usefixtures("method_tmpdir")
def test_get_existing(self):
- blob_id = 'blob_id'
+ blob_id = uuid4().hex
content = "x"
yield self.local.put(blob_id, BytesIO(content), len(content))
result = yield self.local.get(blob_id)
@@ -52,18 +53,18 @@ class SQLBackendTestCase(unittest.TestCase):
@defer.inlineCallbacks
@pytest.mark.usefixtures("method_tmpdir")
def test_delete(self):
- blob_id = 'blob_id'
+ blob_id1, blob_id2 = uuid4().hex, uuid4().hex
content = "x"
- yield self.local.put(blob_id, BytesIO(content), len(content))
- yield self.local.put('remains', BytesIO(content), len(content))
- yield self.local.delete(blob_id)
- self.assertFalse((yield self.local.exists(blob_id)))
- self.assertTrue((yield self.local.exists('remains')))
+ yield self.local.put(blob_id1, BytesIO(content), len(content))
+ yield self.local.put(blob_id2, BytesIO(content), len(content))
+ yield self.local.delete(blob_id1)
+ self.assertFalse((yield self.local.exists(blob_id1)))
+ self.assertTrue((yield self.local.exists(blob_id2)))
@defer.inlineCallbacks
@pytest.mark.usefixtures("method_tmpdir")
def test_list(self):
- blob_ids = [('blob_id%s' % i) for i in range(10)]
+ blob_ids = [uuid4().hex for _ in range(10)]
content = "x"
deferreds = []
for blob_id in blob_ids:
diff --git a/testing/tests/server/test_blobs_server.py b/testing/tests/server/test_blobs_server.py
index 36709ce6..9eddf108 100644
--- a/testing/tests/server/test_blobs_server.py
+++ b/testing/tests/server/test_blobs_server.py
@@ -19,6 +19,7 @@ Integration tests for blobs server
"""
import os
import pytest
+from uuid import uuid4
from io import BytesIO
from twisted.trial import unittest
from twisted.web.server import Site
@@ -52,7 +53,7 @@ class BlobServerTestCase(unittest.TestCase):
@pytest.mark.usefixtures("method_tmpdir")
def test_upload_download(self):
manager = BlobManager('', self.uri, self.secret,
- self.secret, 'user')
+ self.secret, uuid4().hex)
fd = BytesIO("save me")
yield manager._encrypt_and_upload('blob_id', fd)
blob, size = yield manager._download_and_decrypt('blob_id')
@@ -62,7 +63,7 @@ class BlobServerTestCase(unittest.TestCase):
@pytest.mark.usefixtures("method_tmpdir")
def test_set_get_flags(self):
manager = BlobManager('', self.uri, self.secret,
- self.secret, 'user')
+ self.secret, uuid4().hex)
fd = BytesIO("flag me")
yield manager._encrypt_and_upload('blob_id', fd)
yield manager.set_flags('blob_id', [Flags.PROCESSING])
@@ -73,7 +74,7 @@ class BlobServerTestCase(unittest.TestCase):
@pytest.mark.usefixtures("method_tmpdir")
def test_set_flags_raises_if_no_blob_found(self):
manager = BlobManager('', self.uri, self.secret,
- self.secret, 'user')
+ self.secret, uuid4().hex)
with pytest.raises(SoledadError):
yield manager.set_flags('missing_id', [Flags.PENDING])
@@ -81,7 +82,7 @@ class BlobServerTestCase(unittest.TestCase):
@pytest.mark.usefixtures("method_tmpdir")
def test_list_filter_flag(self):
manager = BlobManager('', self.uri, self.secret,
- self.secret, 'user')
+ self.secret, uuid4().hex)
fd = BytesIO("flag me")
yield manager._encrypt_and_upload('blob_id', fd)
yield manager.set_flags('blob_id', [Flags.PROCESSING])
@@ -94,7 +95,7 @@ class BlobServerTestCase(unittest.TestCase):
@pytest.mark.usefixtures("method_tmpdir")
def test_list_filter_flag_order_by_date(self):
manager = BlobManager('', self.uri, self.secret,
- self.secret, 'user')
+ self.secret, uuid4().hex)
yield manager._encrypt_and_upload('blob_id1', BytesIO("x"))
yield manager._encrypt_and_upload('blob_id2', BytesIO("x"))
yield manager._encrypt_and_upload('blob_id3', BytesIO("x"))
@@ -113,7 +114,7 @@ class BlobServerTestCase(unittest.TestCase):
@pytest.mark.usefixtures("method_tmpdir")
def test_cant_set_invalid_flags(self):
manager = BlobManager('', self.uri, self.secret,
- self.secret, 'user')
+ self.secret, uuid4().hex)
fd = BytesIO("flag me")
yield manager._encrypt_and_upload('blob_id', fd)
with pytest.raises(InvalidFlagsError):
@@ -125,7 +126,7 @@ class BlobServerTestCase(unittest.TestCase):
@pytest.mark.usefixtures("method_tmpdir")
def test_get_empty_flags(self):
manager = BlobManager('', self.uri, self.secret,
- self.secret, 'user')
+ self.secret, uuid4().hex)
fd = BytesIO("flag me")
yield manager._encrypt_and_upload('blob_id', fd)
flags = yield manager.get_flags('blob_id')
@@ -135,7 +136,7 @@ class BlobServerTestCase(unittest.TestCase):
@pytest.mark.usefixtures("method_tmpdir")
def test_flags_ignored_by_listing(self):
manager = BlobManager('', self.uri, self.secret,
- self.secret, 'user')
+ self.secret, uuid4().hex)
fd = BytesIO("flag me")
yield manager._encrypt_and_upload('blob_id', fd)
yield manager.set_flags('blob_id', [Flags.PROCESSING])
@@ -146,7 +147,7 @@ class BlobServerTestCase(unittest.TestCase):
@pytest.mark.usefixtures("method_tmpdir")
def test_upload_changes_remote_list(self):
manager = BlobManager('', self.uri, self.secret,
- self.secret, 'user')
+ self.secret, uuid4().hex)
yield manager._encrypt_and_upload('blob_id1', BytesIO("1"))
yield manager._encrypt_and_upload('blob_id2', BytesIO("2"))
blobs_list = yield manager.remote_list()
@@ -155,13 +156,14 @@ class BlobServerTestCase(unittest.TestCase):
@defer.inlineCallbacks
@pytest.mark.usefixtures("method_tmpdir")
def test_list_orders_by_date(self):
+ user_uid = uuid4().hex
manager = BlobManager('', self.uri, self.secret,
- self.secret, 'user')
+ self.secret, user_uid)
yield manager._encrypt_and_upload('blob_id1', BytesIO("1"))
yield manager._encrypt_and_upload('blob_id2', BytesIO("2"))
blobs_list = yield manager.remote_list(order_by='date')
self.assertEquals(['blob_id1', 'blob_id2'], blobs_list)
- parts = ['user', 'default', 'b', 'blo', 'blob_i', 'blob_id1']
+ parts = [user_uid, 'default', 'b', 'blo', 'blob_i', 'blob_id1']
self.__touch(self.tempdir, *parts)
blobs_list = yield manager.remote_list(order_by='+date')
self.assertEquals(['blob_id2', 'blob_id1'], blobs_list)
@@ -172,7 +174,7 @@ class BlobServerTestCase(unittest.TestCase):
@pytest.mark.usefixtures("method_tmpdir")
def test_count(self):
manager = BlobManager('', self.uri, self.secret,
- self.secret, 'user')
+ self.secret, uuid4().hex)
deferreds = []
for i in range(10):
deferreds.append(manager._encrypt_and_upload(str(i), BytesIO("1")))
@@ -185,7 +187,7 @@ class BlobServerTestCase(unittest.TestCase):
@pytest.mark.usefixtures("method_tmpdir")
def test_list_restricted_by_namespace(self):
manager = BlobManager('', self.uri, self.secret,
- self.secret, 'user')
+ self.secret, uuid4().hex)
namespace = 'incoming'
yield manager._encrypt_and_upload('blob_id1', BytesIO("1"),
namespace=namespace)
@@ -197,7 +199,7 @@ class BlobServerTestCase(unittest.TestCase):
@pytest.mark.usefixtures("method_tmpdir")
def test_list_default_doesnt_list_other_namespaces(self):
manager = BlobManager('', self.uri, self.secret,
- self.secret, 'user')
+ self.secret, uuid4().hex)
namespace = 'incoming'
yield manager._encrypt_and_upload('blob_id1', BytesIO("1"),
namespace=namespace)
@@ -209,7 +211,7 @@ class BlobServerTestCase(unittest.TestCase):
@pytest.mark.usefixtures("method_tmpdir")
def test_download_from_namespace(self):
manager = BlobManager('', self.uri, self.secret,
- self.secret, 'user')
+ self.secret, uuid4().hex)
namespace, blob_id, content = 'incoming', 'blob_id1', 'test'
yield manager._encrypt_and_upload(blob_id, BytesIO(content),
namespace=namespace)
@@ -225,7 +227,7 @@ class BlobServerTestCase(unittest.TestCase):
@pytest.mark.usefixtures("method_tmpdir")
def test_upload_deny_duplicates(self):
manager = BlobManager('', self.uri, self.secret,
- self.secret, 'user')
+ self.secret, uuid4().hex)
fd = BytesIO("save me")
yield manager._encrypt_and_upload('blob_id', fd)
fd = BytesIO("save me")
@@ -236,7 +238,7 @@ class BlobServerTestCase(unittest.TestCase):
@pytest.mark.usefixtures("method_tmpdir")
def test_send_missing(self):
manager = BlobManager(self.tempdir, self.uri, self.secret,
- self.secret, 'user')
+ self.secret, uuid4().hex)
self.addCleanup(manager.close)
blob_id = 'local_only_blob_id'
yield manager.local.put(blob_id, BytesIO("X"), size=1)
@@ -249,7 +251,7 @@ class BlobServerTestCase(unittest.TestCase):
@pytest.mark.usefixtures("method_tmpdir")
def test_fetch_missing(self):
manager = BlobManager(self.tempdir, self.uri, self.secret,
- self.secret, 'user')
+ self.secret, uuid4().hex)
self.addCleanup(manager.close)
blob_id = 'remote_only_blob_id'
yield manager._encrypt_and_upload(blob_id, BytesIO("X"))
@@ -262,7 +264,7 @@ class BlobServerTestCase(unittest.TestCase):
@pytest.mark.usefixtures("method_tmpdir")
def test_upload_then_delete_updates_list(self):
manager = BlobManager('', self.uri, self.secret,
- self.secret, 'user')
+ self.secret, uuid4().hex)
yield manager._encrypt_and_upload('blob_id1', BytesIO("1"))
yield manager._encrypt_and_upload('blob_id2', BytesIO("2"))
yield manager._delete_from_remote('blob_id1')
@@ -273,7 +275,7 @@ class BlobServerTestCase(unittest.TestCase):
@pytest.mark.usefixtures("method_tmpdir")
def test_upload_then_delete_updates_list_using_namespace(self):
manager = BlobManager('', self.uri, self.secret,
- self.secret, 'user')
+ self.secret, uuid4().hex)
namespace = 'special_archives'
yield manager._encrypt_and_upload('blob_id1', BytesIO("1"),
namespace=namespace)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 16:31:41 +0000