← Back to branch summary

~nataliabidart/ubuntuone-client/login-email-password-for-everyone

« back to all changes in this revision

Viewing changes to ubuntuone/syncdaemon/main.py

  • Committer: Tarmac
  • Author(s): Natalia B. Bidart
  • Date: 2011-08-10 19:08:43 UTC
  • mfrom: (1099.1.2 clean-env-aq)
  • Revision ID: tarmac-20110810190843-80bere8l3k3471x6
- Fake ExternalInterface when testing the main module (LP: #823982).
- Do a proper clean on test_action_queue tests (LP: #823895).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/syncdaemon/main.py
37
37
    volume_manager,
38
38
)
39
39
from ubuntuone import syncdaemon, clientdefs
40
 
import ubuntuone.platform
41
 
 
42
 
from ubuntuone.platform import event_logging
 
40
from ubuntuone.platform import event_logging, ExternalInterface
43
41
from ubuntuone.syncdaemon import status_listener
44
42
from ubuntuone.syncdaemon.states import StateManager, QueueManager
45
43
 
129
127
        self.lr = local_rescan.LocalRescan(self.vm, self.fs,
130
128
                                           self.event_q, self.action_q)
131
129
 
132
 
        self.external = ubuntuone.platform.ExternalInterface(
 
130
        self.external = ExternalInterface(
133
131
            self, glib_loop, broadcast_events)
134
132
        self.external.oauth_credentials = oauth_credentials
135
133
        if user_config.get_autoconnect():