← Back to branch summary

~ubuntu-branches/ubuntu/precise/ubuntuone-client/precise

« back to all changes in this revision

Viewing changes to tests/platform/linux/eventlog/test_zglog.py

  • Committer: Package Import Robot
  • Author(s): Rodney Dawes
  • Date: 2011-12-21 15:46:25 UTC
  • mfrom: (1.1.56)
  • Revision ID: package-import@ubuntu.com-20111221154625-ujvunri4frsecj2k
Tags: 2.99.0-0ubuntu1
https://launchpad.net/bugs/692597
https://launchpad.net/bugs/869920
* New upstream release.
  - Verify timestamp to avoid invalid auth failures (LP: #692597)
  - Files in new UDFs not uploaded due to filtering (LP: #869920)
* debian/patches:
  - Remove upstreamed patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/platform/linux/eventlog/test_zglog.py
25
25
 
26
26
from distutils.spawn import find_executable
27
27
 
28
 
from twisted.internet.defer import Deferred, inlineCallbacks
 
28
from twisted.internet import defer
29
29
from zeitgeist.client import ZeitgeistClient
30
30
from zeitgeist.datamodel import Event, Subject, Interpretation, Manifestation
31
31
 
92
92
class ZeitgeistTestCase(DBusTwistedTestCase):
93
93
    """Tests for the zeitgeist logging module."""
94
94
 
95
 
    @inlineCallbacks
 
95
    @defer.inlineCallbacks
96
96
    def setUp(self):
97
97
        yield super(ZeitgeistTestCase, self).setUp()
98
98
        zgdaemon = find_executable("zeitgeist-daemon")
139
139
        zg = ZeitgeistLogger()
140
140
        self.assertNotEqual(zg.client, None)
141
141
 
142
 
        d2 = Deferred()
 
142
        d2 = defer.Deferred()
143
143
 
144
144
        def logged(id_list):
145
145
            """The event was logged to zeitgeist."""