diff options
| author | Seif Lotfy <seif@lotfy.com> | 2012-10-16 15:00:01 +0200 |
|---|---|---|
| committer | Seif Lotfy <seif@lotfy.com> | 2012-10-16 15:00:01 +0200 |
| commit | 45866c24bb2cd1725a9b9aa69ea394e093a365a5 (patch) | |
| tree | 3244aecfd236ce0cde7eea51e742a262a490c9d9 /test | |
| parent | 2e65d4f13a4fed5b3436d459ebc706d3ba235607 (diff) | |
fix testcases to adapt to changes in five_events.js
Diffstat (limited to 'test')
| -rw-r--r-- | test/dbus/engine-test.py | 2 | ||||
| -rw-r--r-- | test/dbus/remote-test.py | 4 | ||||
| -rw-r--r-- | test/dbus/testutils.py | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/test/dbus/engine-test.py b/test/dbus/engine-test.py index 226dbbd5..9213d411 100644 --- a/test/dbus/engine-test.py +++ b/test/dbus/engine-test.py @@ -628,7 +628,7 @@ class ZeitgeistEngineTest(testutils.RemoteTestCase): num_events=10, result_type=ResultType.MostRecentEvents ) - self.assertEquals(4, len(ids)) + self.assertEquals(3, len(ids)) if __name__ == "__main__": testutils.run() diff --git a/test/dbus/remote-test.py b/test/dbus/remote-test.py index 0ab930a5..187faac5 100644 --- a/test/dbus/remote-test.py +++ b/test/dbus/remote-test.py @@ -406,12 +406,12 @@ class ZeitgeistRemoteFindEventIdsTest(testutils.RemoteTestCase): # Retrieve events for a particular origin template = Event.new_for_values(subject_origin='file:///tmp') ids = self.findEventIdsAndWait([template]) - self.assertEquals(ids, [4, 2, 3, 1]) + self.assertEquals(ids, [4, 2, 3]) # Now let's try with wildcard and negation template = Event.new_for_values(subject_origin='!file:*') ids = self.findEventIdsAndWait([template]) - self.assertEquals(map(int, ids), [5]) + self.assertEquals(map(int, ids), [5, 1]) def testFindEventIdsForSubjectText(self): # Retrieve events with a particular text diff --git a/test/dbus/testutils.py b/test/dbus/testutils.py index fda79557..673767dd 100644 --- a/test/dbus/testutils.py +++ b/test/dbus/testutils.py @@ -192,13 +192,13 @@ class RemoteTestCase (unittest.TestCase): os.kill(self.daemon.pid, kill_signal) return self.daemon.wait() - def setUp(self): + def setUp(self, db_path=":memory:"): assert self.daemon is None assert self.client is None self.env = os.environ.copy() self.datapath = tempfile.mkdtemp(prefix="zeitgeist.datapath.") self.env.update({ - "ZEITGEIST_DATABASE_PATH": ":memory:", + "ZEITGEIST_DATABASE_PATH": db_path, "ZEITGEIST_DATA_PATH": self.datapath, "XDG_CACHE_HOME": os.path.join(self.datapath, "cache"), }) |