mirror of
https://github.com/internetarchive/warcprox.git
synced 2025-01-18 13:22:09 +01:00
make test_crawl_log expect HEAD request to be logged
This commit is contained in:
parent
78c6137016
commit
df6d7f1ce6
2
setup.py
2
setup.py
@ -51,7 +51,7 @@ except:
|
|||||||
|
|
||||||
setuptools.setup(
|
setuptools.setup(
|
||||||
name='warcprox',
|
name='warcprox',
|
||||||
version='2.2.1b2.dev110',
|
version='2.2.1b2.dev111',
|
||||||
description='WARC writing MITM HTTP/S proxy',
|
description='WARC writing MITM HTTP/S proxy',
|
||||||
url='https://github.com/internetarchive/warcprox',
|
url='https://github.com/internetarchive/warcprox',
|
||||||
author='Noah Levitt',
|
author='Noah Levitt',
|
||||||
|
@ -1445,9 +1445,33 @@ def test_crawl_log(warcprox_, http_daemon, archiving_proxies):
|
|||||||
url = 'http://localhost:%s/b/cc' % http_daemon.server_port
|
url = 'http://localhost:%s/b/cc' % http_daemon.server_port
|
||||||
headers = {'Warcprox-Meta': json.dumps({'warc-prefix': 'test_crawl_log_3'})}
|
headers = {'Warcprox-Meta': json.dumps({'warc-prefix': 'test_crawl_log_3'})}
|
||||||
response = requests.head(url, proxies=archiving_proxies, headers=headers)
|
response = requests.head(url, proxies=archiving_proxies, headers=headers)
|
||||||
time.sleep(3)
|
|
||||||
assert not os.path.exists(os.path.join(
|
start = time.time()
|
||||||
warcprox_.options.crawl_log_dir, 'test_crawl_log_3.log'))
|
while time.time() - start < 10:
|
||||||
|
if os.path.exists(os.path.join(
|
||||||
|
warcprox_.options.crawl_log_dir, 'test_crawl_log_3.log')):
|
||||||
|
break
|
||||||
|
time.sleep(0.5)
|
||||||
|
|
||||||
|
crawl_log_3 = open(os.path.join(
|
||||||
|
warcprox_.options.crawl_log_dir, 'test_crawl_log_3.log'), 'rb').read()
|
||||||
|
|
||||||
|
assert re.match(b'\A2[^\n]+\n\Z', crawl_log_3)
|
||||||
|
assert crawl_log_3[24:31] == b' 200 '
|
||||||
|
assert crawl_log_3[31:42] == b' 0 '
|
||||||
|
fields = crawl_log_3.split()
|
||||||
|
assert len(fields) == 13
|
||||||
|
assert fields[3].endswith(b'/b/cc')
|
||||||
|
assert fields[4] == b'-'
|
||||||
|
assert fields[5] == b'-'
|
||||||
|
assert fields[6] == b'text/plain'
|
||||||
|
assert fields[7] == b'-'
|
||||||
|
assert re.match(br'^\d{17}[+]\d{3}', fields[8])
|
||||||
|
assert fields[9] == b'sha1:da39a3ee5e6b4b0d3255bfef95601890afd80709'
|
||||||
|
assert fields[10] == b'-'
|
||||||
|
assert fields[11] == b'-'
|
||||||
|
extra_info = json.loads(fields[12].decode('utf-8'))
|
||||||
|
assert extra_info == {'contentSize': 91}
|
||||||
|
|
||||||
# WARCPROX_WRITE_RECORD
|
# WARCPROX_WRITE_RECORD
|
||||||
url = 'http://fakeurl/'
|
url = 'http://fakeurl/'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user