← Back to branch summary

~nataliabidart/magicicada-server/bump-client-new-namespace

« back to all changes in this revision

Viewing changes to magicicada/server/tests/test_content.py

  • Committer: Natalia
  • Date: 2018-05-31 00:27:17 UTC
  • Revision ID: natalia.bidart@ubuntu.com-20180531002717-ltcne00ovkrqk097
Fixed tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
magicicada/server/tests/test_content.py
25
25
 
26
26
from StringIO import StringIO
27
27
 
28
 
from mocker import Mocker, expect, ARGS, KWARGS, ANY
29
 
from twisted.internet import defer, reactor, threads, task, address
30
 
from twisted.trial.unittest import TestCase
31
 
from twisted.test.proto_helpers import StringTransport
32
 
from ubuntuone.storageprotocol import (
 
28
from magicicadaprotocol import (
33
29
    request,
34
30
    client as sp_client,
35
31
    errors as protoerrors,
36
32
    protocol_pb2,
37
33
)
38
 
from ubuntuone.storageprotocol.content_hash import (
 
34
from magicicadaprotocol.content_hash import (
39
35
    content_hash_factory,
40
36
    crc32,
41
37
    magic_hash_factory,
42
38
)
 
39
from mocker import Mocker, expect, ARGS, KWARGS, ANY
 
40
from twisted.internet import defer, reactor, threads, task, address
 
41
from twisted.trial.unittest import TestCase
 
42
from twisted.test.proto_helpers import StringTransport
43
43
 
44
44
from magicicada import settings
45
45
from magicicada.filesync import errors