summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Shyba <victor1984@riseup.net>2017-11-27 09:36:04 -0300
committerVictor Shyba <victor1984@riseup.net>2017-12-01 01:38:08 -0300
commit5c8109086429211b8f9f1444f1b56a285e49dd6a (patch)
tree7eef064d5ff5c3f53ce8dbecd7afe1ea2798e7e5
parent0772476f1759f2f0d490748047881f503e38c28c (diff)
[test] init StreamingResource on test_blobs_server
-- Related: #8809
-rw-r--r--tests/server/test_blobs_server.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/tests/server/test_blobs_server.py b/tests/server/test_blobs_server.py
index 4e7b4a3b..eabf3ee7 100644
--- a/tests/server/test_blobs_server.py
+++ b/tests/server/test_blobs_server.py
@@ -19,16 +19,19 @@ Integration tests for blobs server
"""
import os
import pytest
+from urlparse import urljoin
from uuid import uuid4
from io import BytesIO
from twisted.trial import unittest
from twisted.web.server import Site
+from twisted.web.resource import Resource
from twisted.internet import reactor
from twisted.internet import defer
from treq._utils import set_global_pool
from leap.soledad.common.blobs import Flags
from leap.soledad.server import _blobs as server_blobs
+from leap.soledad.server._streaming_resource import StreamingResource
from leap.soledad.client._db.blobs import BlobManager
from leap.soledad.client._db.blobs import BlobAlreadyExistsError
from leap.soledad.client._db.blobs import InvalidFlagsError
@@ -50,11 +53,17 @@ class BlobServerTestCase(unittest.TestCase):
def setUp(self):
client_blobs.sync.MAX_WAIT = 0.1
- root = server_blobs.BlobsResource("filesystem", self.tempdir)
+ blobs_resource = server_blobs.BlobsResource("filesystem", self.tempdir)
+ stream_resource = StreamingResource("filesystem", self.tempdir)
+ root = Resource()
+ root.putChild('blobs', blobs_resource)
+ root.putChild('stream', stream_resource)
self.site = Site(root)
self.port = reactor.listenTCP(0, self.site, interface='127.0.0.1')
self.host = self.port.getHost()
self.uri = 'http://%s:%s/' % (self.host.host, self.host.port)
+ self.stream_uri = urljoin(self.uri, 'stream/')
+ self.uri = urljoin(self.uri, 'blobs/')
self.secret = 'A' * 96
set_global_pool(None)