From a75335972e7ce9b2f7d4d96fa349967c6aff1742 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Allan=C3=A7on?= <haltode@gmail.com>
Date: Wed, 6 Jan 2021 10:43:32 +0100
Subject: [PATCH] tests: revision: remove temporary sleep(2) hack
Now that the .status file behavior is consistent, we can safely rely on
it during unit tests.
Close T2830.
---
swh/fuse/tests/test_revision.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/swh/fuse/tests/test_revision.py b/swh/fuse/tests/test_revision.py
index 48661ad..d882151 100644
--- a/swh/fuse/tests/test_revision.py
+++ b/swh/fuse/tests/test_revision.py
@@ -72,9 +72,14 @@ def test_list_history(fuse_mntdir):
assert depth2 in (os.listdir(dir_by_page / depth1))
dir_by_date = dir_path / "by-date"
- # TODO: rely on .status file instead to wait
- # Wait 2 seconds to populate by-date/ dir
- time.sleep(2)
+ # Wait max 2 seconds to populate by-date/ dir
+ for i in range(200):
+ entries = os.listdir(dir_by_date)
+ if entries and ".status" not in entries:
+ break
+ time.sleep(0.1)
+ assert not (dir_by_date / ".status").exists()
+
for swhid in expected:
meta = get_data_from_web_archive(str(swhid))
date = dateutil.parser.parse(meta["date"])
@@ -84,4 +89,3 @@ def test_list_history(fuse_mntdir):
depth2 = str(swhid)
assert (dir_by_date / depth1).exists()
assert depth2 in (os.listdir(dir_by_date / depth1))
- assert not (dir_by_date / ".status").exists()
--
GitLab