From: David Stainton <dstainton415@gmail.com>
Date: Tue, 3 Nov 2015 12:28:28 +0000 (+0100)
Subject: Fix test helper _check_version_in_local_db
X-Git-Url: https://git.rkrishnan.org/%5B/FOOURL?a=commitdiff_plain;h=ff640771c210030bbc0766810a9c8029752a0b0e;p=tahoe-lafs%2Ftahoe-lafs.git

Fix test helper _check_version_in_local_db
---

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)