From e1f21dd123bfe2dab7ebd05a25f2812ce32c9c92 Mon Sep 17 00:00:00 2001 From: David Stainton Date: Tue, 3 Nov 2015 13:28:28 +0100 Subject: [PATCH] Fix test helper _check_version_in_local_db --- src/allmydata/test/test_magic_folder.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/allmydata/test/test_magic_folder.py b/src/allmydata/test/test_magic_folder.py index 0d09b9c1..b4f1c9cf 100644 --- a/src/allmydata/test/test_magic_folder.py +++ b/src/allmydata/test/test_magic_folder.py @@ -656,9 +656,10 @@ class MagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, ReallyEqual return d def _check_version_in_local_db(self, magicfolder, relpath_u, expected_version): - version = magicfolder._db.get_local_file_version(relpath_u) - #print "_check_version_in_local_db: %r has version %s" % (relpath_u, version) - self.failUnlessEqual(version, expected_version) + db_entry = magicfolder._db.get_db_entry(relpath_u) + if db_entry is not None: + #print "_check_version_in_local_db: %r has version %s" % (relpath_u, version) + self.failUnlessEqual(db_entry.version, expected_version) def _check_file_gone(self, magicfolder, relpath_u): path = os.path.join(magicfolder.uploader._local_path_u, relpath_u) -- 2.45.2