diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/manager/test_filemanager.py | 4 | ||||
| -rw-r--r-- | tests/other/test_filedatabase.py | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/tests/manager/test_filemanager.py b/tests/manager/test_filemanager.py index 81acea4d0..5b9fbb567 100644 --- a/tests/manager/test_filemanager.py +++ b/tests/manager/test_filemanager.py @@ -58,7 +58,7 @@ class TestFileManager(BenchmarkTest): for pid in self.pids: self.m.addLinks([("plugin %d" % i, "url %s" % i) for i in range(self.count)], pid) - count = self.m.getQueueCount() + count = self.m.getQueueStats()[0] files = self.count * len(self.pids) # in test runner files get added twice assert count == files or count == files * 2 @@ -91,7 +91,7 @@ class TestFileManager(BenchmarkTest): finished = self.m.getTree(-1, True, DownloadState.Finished) unfinished = self.m.getTree(-1, True, DownloadState.Unfinished) - assert len(finished.files) + len(unfinished.files) == len(all.files) == self.m.getFileCount() + assert len(finished.files) + len(unfinished.files) == len(all.files) == self.m.db.filecount() def test_get_files_root(self): diff --git a/tests/other/test_filedatabase.py b/tests/other/test_filedatabase.py index 3a63b75d5..9a5b236a8 100644 --- a/tests/other/test_filedatabase.py +++ b/tests/other/test_filedatabase.py @@ -158,9 +158,8 @@ class TestDatabase(BenchmarkTest): def test_count(self): self.db.purgeAll() - assert self.db.filecount() == 0 - assert self.db.downloadcount() == 0 - assert self.db.queuecount() == 0 + assert self.db.downloadstats() == (0,0) + assert self.db.queuestats() == (0,0) assert self.db.processcount() == 0 def test_update(self): |