From aca0b881c6fd1e9c64ed4fe8f1ad97000d6d22a7 Mon Sep 17 00:00:00 2001 From: Noah Levitt Date: Fri, 19 May 2017 16:34:27 -0700 Subject: [PATCH] make sure records are written to warc in a predictable order to make tests pass consistently --- setup.py | 2 +- tests/test_warcprox.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5ce3203..445250e 100755 --- a/setup.py +++ b/setup.py @@ -51,7 +51,7 @@ except: setuptools.setup( name='warcprox', - version='2.1b1.dev84', + version='2.1b1.dev85', description='WARC writing MITM HTTP/S proxy', url='https://github.com/internetarchive/warcprox', author='Noah Levitt', diff --git a/tests/test_warcprox.py b/tests/test_warcprox.py index 696cfaa..9fcbd03 100755 --- a/tests/test_warcprox.py +++ b/tests/test_warcprox.py @@ -738,6 +738,12 @@ def test_dedup_buckets(https_daemon, http_daemon, warcprox_, archiving_proxies, assert response.headers['warcprox-test-header'] == 'k!' assert response.content == b'I am the warcprox test payload! llllllllll!\n' + # wait for writer thread to process + time.sleep(0.5) + while not all(wwt.idle for wwt in warcprox_.warc_writer_threads): + time.sleep(0.5) + time.sleep(0.5) + # archive url1 bucket_b headers = {"Warcprox-Meta": json.dumps({"warc-prefix":"test_dedup_buckets","captures-bucket":"bucket_b"})} response = requests.get(url1, proxies=archiving_proxies, verify=False, headers=headers)