ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-13 22:03:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Test fixups

Browse Source
This commit is contained in:
meejah 2018-04-11 14:21:09 -06:00
parent 435b30c7aa
commit cc93a12a85
3 changed files with 23 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
integration/test_magic_folder.py
View File

@ -242,39 +242,26 @@ def test_bob_conflicts_with_alice_fresh(magic_folder):
join(bob_dir, 'alpha.conflict'),
join(alice_dir, 'alpha.conflict'),
]
found = None
found = 0
start_time = time.time()
while not found and time.time() - start_time < 15.0:
while found != 2 and time.time() - start_time < 15.0:
print(" waiting for conflict")
print("bob")
print(listdir(bob_dir))
print("alice")
print(listdir(alice_dir))
found = 0
for path in acceptable:
if exists(path):
print("FOUND {}".format(path))
found = path
break
found += 1
time.sleep(1)
assert found, "should have gotten a conflict"
if exists(acceptable[0]): # bob got the conflict, so alice won the race
assert open(join(bob_dir, 'alpha'), 'r').read() == "this is bob's alpha\n"
assert open(join(bob_dir, 'alpha.conflict'), 'r').read() == "this is alice's alpha\n"
assert open(join(alice_dir, 'alpha'), 'r').read() == "this is alice's alpha\n"
if exists(join(alice_dir, 'alpha.conflict')):
assert open(join(alice_dir, 'alpha.conflict'), 'r').read() == "this is bob's alpha\n"
# hmm, so Alice is getting a conflict *too*? Is that okay?
# assert not exists(join(alice_dir, 'alpha.conflict'))
else: # alice got the conflict, so bob won the race
assert exists(acceptable[1])
assert open(join(alice_dir, 'alpha'), 'r').read() == "this is alice's alpha\n"
assert open(join(alice_dir, 'alpha.conflict'), 'r').read() == "this is bob's alpha\n"
assert open(join(bob_dir, 'alpha'), 'r').read() == "this is bob's alpha\n"
if exists(join(bob_dir, 'alpha.conflict')):
assert open(join(bob_dir, 'alpha.conflict'), 'r').read() == "this is alice's alpha\n"
# hmm, so Bob is getting a conflict *too*? Is that okay?
# assert not exists(join(bob_dir, 'alpha.conflict'))
assert found == 2, "both sides should conflict"
assert open(join(bob_dir, 'alpha'), 'r').read() == "this is bob's alpha\n"
assert open(join(bob_dir, 'alpha.conflict'), 'r').read() == "this is alice's alpha\n"
assert open(join(alice_dir, 'alpha'), 'r').read() == "this is alice's alpha\n"
assert open(join(alice_dir, 'alpha.conflict'), 'r').read() == "this is bob's alpha\n"
def test_bob_conflicts_with_alice_preexisting(magic_folder):

24
src/allmydata/frontends/magic_folder.py
View File

@ -842,6 +842,8 @@ class Uploader(QueueMixin):
if db_entry.last_downloaded_uri is not None:
metadata['last_downloaded_uri'] = db_entry.last_downloaded_uri
if db_entry.last_uploaded_uri is not None:
metadata['last_uploaded_uri'] = db_entry.last_uploaded_uri
empty_uploadable = Data("", self._client.convergence)
d2 = self._upload_dirnode.add_file(
@ -916,8 +918,11 @@ class Uploader(QueueMixin):
'last_downloaded_timestamp': last_downloaded_timestamp,
'user_mtime': pathinfo.mtime_ns / 1000000000.0, # why are we using ns in PathInfo??
}
if db_entry is not None and db_entry.last_downloaded_uri is not None:
metadata['last_downloaded_uri'] = db_entry.last_downloaded_uri
if db_entry is not None:
if db_entry.last_downloaded_uri is not None:
metadata['last_downloaded_uri'] = db_entry.last_downloaded_uri
if db_entry.last_uploaded_uri is not None:
metadata['last_uploaded_uri'] = db_entry.last_uploaded_uri
uploadable = FileName(unicode_from_filepath(fp), self._client.convergence)
d2 = self._upload_dirnode.add_file(
@ -1360,7 +1365,6 @@ class Downloader(QueueMixin, WriteFileMixin):
# * 2b. Read the following information for the path ``foo`` from the
# local magic folder db:
# * the *last-seen statinfo*, if any (this is the size in
# bytes, ``mtime``, and ``ctime`` stored in the ``local_files``
# table when the file was last uploaded);
@ -1370,13 +1374,13 @@ class Downloader(QueueMixin, WriteFileMixin):
if db_entry:
dmd_last_uploaded_uri = db_entry.last_uploaded_uri
if dmd_last_uploaded_uri is None:
# not 100% sure about this; *does* work but does
# the spec need fixups, then?
dmd_last_uploaded_uri = item.metadata.get('last_uploaded_uri', None)
# * 2c. If any of the following are true, then classify as a conflict:
# * i. there are pending notifications of changes to ``foo``;
# XXX FIXME
# * ii. the last-seen statinfo is either absent (i.e. there is
# no entry in the database for this path), or different from the
# current statinfo;
@ -1388,15 +1392,9 @@ class Downloader(QueueMixin, WriteFileMixin):
is_conflict = True
self._log("conflict because local change")
# XXX is "last-seen statinfo" last_downloaded_timestamp?
# * iii. either ``last_downloaded_uri`` or ``last_uploaded_uri``
# (or both) are absent, or they are different.
# XXX actually I think the spec is slightly wrong
# here: if Alice keeps upload new versions and Bob
# never has, when would his last_uploaded_uri ever
# change?
elif dmd_last_downloaded_uri is None:
is_conflict = True
self._log("conflict because no last_downloaded_uri")

3
src/allmydata/util/fake_inotify.py
View File

@ -82,6 +82,9 @@ class INotify(object):
def stopReading(self):
pass
def loseConnection(self):
pass
def watch(self, filepath, mask=IN_WATCH_MASK, autoAdd=False, callbacks=None, recursive=False):
self.callbacks = callbacks