~didrocks/ubuntuone-client/use_result_var

« back to all changes in this revision

Viewing changes to tests/platform/linux/test_tools.py

  • Committer: Bazaar Package Importer
  • Author(s): Rodney Dawes
  • Date: 2011-01-07 10:36:49 UTC
  • mfrom: (1.1.42 upstream)
  • Revision ID: james.westby@ubuntu.com-20110107103649-wy7te58dl47kwfgs
Tags: 1.5.2-0ubuntu1
* New upstream release.
  - ImportError: No module named tools (LP: #692566)
  - Preferences doesn't display info properly (LP: #657850)
  - Ubuntu One crashes in scan() (LP: #692496)A
  - Provide a specific login D-Bus service (LP: #697211)

Show diffs side-by-side

added added

removed removed

Lines of Context:
86
86
            self.event_q.unsubscribe(self.main.vm)
87
87
            for event_name in event_names:
88
88
                args = event_queue.EVENTS[event_name]
89
 
                self.event_q.push(event_name, *args)
 
89
                self.event_q.push(event_name, **dict((x, x) for x in args))
90
90
 
91
91
        reactor.callLater(0, self.action_q.connect)
92
92
        reactor.callLater(0, fire_events)
136
136
        def fire_events():
137
137
            for event_name in event_queue.EVENTS.keys():
138
138
                args = event_queue.EVENTS[event_name]
139
 
                self.event_q.push(event_name, *args)
 
139
                self.event_q.push(event_name, **dict((x, x) for x in args))
140
140
 
141
141
        # fire fake events to keep the deferred running
142
142
        reactor.callLater(0, fire_events)
371
371
        # patch AQ.create_udf
372
372
        def create_udf(path, name, marker):
373
373
            """Fake create_udf"""
374
 
            self.main.event_q.push("AQ_CREATE_UDF_OK", **dict(volume_id=id,
375
 
                                                       node_id=node_id,
376
 
                                                       marker=marker))
 
374
            self.main.event_q.push("AQ_CREATE_UDF_OK", volume_id=id,
 
375
                                   node_id=node_id, marker=marker)
377
376
        self.main.action_q.create_udf = create_udf
378
377
 
379
378
        d = self.tool.create_folder(path)