← Back to branch summary

~ubuntuone-control-tower/ubuntuone-client/trunk

« back to all changes in this revision

Viewing changes to tests/syncdaemon/test_vm.py

  • Committer: Rodney Dawes
  • Date: 2009-06-26 17:01:42 UTC
  • mto: This revision was merged to the branch mainline in revision 60.
  • Revision ID: rodney.dawes@canonical.com-20090626170142-a738504rgnarizuw
        Remove the canonical namespace, and just use ubuntuone as the toplevel
        Move storage/syncdaemon and storage/u1sync up a level

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/syncdaemon/test_vm.py
21
21
import os
22
22
import uuid
23
23
 
24
 
from canonical.ubuntuone.storage.protocol.client import ListShares
25
 
from canonical.ubuntuone.storage.protocol.sharersp import (
 
24
from ubuntuone.storageprotocol.client import ListShares
 
25
from ubuntuone.storageprotocol.sharersp import (
26
26
    NotifyShareHolder,
27
27
    ShareResponse,
28
28
)
30
30
    FakeMain,
31
31
    BaseTwistedTestCase,
32
32
)
33
 
from canonical.ubuntuone.storage.syncdaemon.volume_manager import (
 
33
from ubuntuone.syncdaemon.volume_manager import (
34
34
    Share,
35
35
    VolumeManager,
36
36
    ShareFileShelf,