~chicharreros/magicicada-client/1.0

« back to all changes in this revision

Viewing changes to ubuntuone/syncdaemon/tests/test_action_queue.py

  • Committer: Magicicada Bot
  • Author(s): Natalia
  • Date: 2018-04-24 15:59:00 UTC
  • mfrom: (1442.1.1 use-protocol-from-wheel)
  • Revision ID: magicicada_bot-20180424155900-2mwasih60li4jh2p
[r=facundo] - Use protocol from wheel release.
- Fix copyright headers from modified files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
45
45
 
46
46
import OpenSSL.SSL
47
47
 
 
48
from magicicadaprotocol import (
 
49
    client,
 
50
    content_hash,
 
51
    errors,
 
52
    protocol_pb2,
 
53
    request,
 
54
)
48
55
from mocker import Mocker, MockerTestCase, ANY, expect
49
56
from twisted.internet import defer, reactor
50
57
from twisted.internet import error as twisted_error
65
72
from ubuntuone.devtools.testcases import skipTest
66
73
from ubuntuone import logger, clientdefs
67
74
from ubuntuone.platform import open_file, platform, path_exists
68
 
from ubuntuone.storageprotocol import (
69
 
    client,
70
 
    content_hash,
71
 
    errors,
72
 
    protocol_pb2,
73
 
    request,
74
 
)
75
75
from ubuntuone.syncdaemon import interfaces, config
76
76
from ubuntuone.syncdaemon import action_queue
77
77
from ubuntuone.syncdaemon.action_queue import (