From 47271bbfab2df2115f3356a5248e2b0dcbc23a48 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Sun, 2 Mar 2014 08:55:26 -0800 Subject: [PATCH] remove extra .gz file, change test to use zipnum file instead --- pywb/utils/test/loaders_test.py | 8 ++++---- sample_archive/cdx/iana.cdx.gz | Bin 3785 -> 0 bytes 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 sample_archive/cdx/iana.cdx.gz diff --git a/pywb/utils/test/loaders_test.py b/pywb/utils/test/loaders_test.py index 7dc42d83..a8454816 100644 --- a/pywb/utils/test/loaders_test.py +++ b/pywb/utils/test/loaders_test.py @@ -30,9 +30,9 @@ >>> DecompressingBufferedReader(open(test_cdx_dir + 'iana.cdx', 'rb')).readline() ' CDX N b a m s k r M S V g\\n' -#DecompressingBufferedReader readline() with decompression ->>> DecompressingBufferedReader(open(test_cdx_dir + 'iana.cdx.gz', 'rb'), decomp_type = 'gzip').readline() -' CDX N b a m s k r M S V g\\n' +#DecompressingBufferedReader readline() with decompression (zipnum file, no header) +>>> DecompressingBufferedReader(open(test_zip_dir + 'zipnum-sample.cdx.gz', 'rb'), decomp_type = 'gzip').readline() +'com,example)/ 20140127171200 http://example.com text/html 200 B2LTWWPUOYAH7UIPQ7ZUPQ4VMBSVC36A - - 1046 334 dupes.warc.gz\\n' >>> BlockLoader(HMACCookieMaker('test', 'test', 5)).load('http://example.com', 41, 14).read() 'Example Domain' @@ -60,7 +60,7 @@ from pywb.utils.bufferedreaders import DecompressingBufferedReader from pywb import get_test_dir #test_cdx_dir = os.path.dirname(os.path.realpath(__file__)) + '/../sample-data/' test_cdx_dir = get_test_dir() + 'cdx/' - +test_zip_dir = get_test_dir() + 'zipcdx/' def read_multiple(reader, inc_reads): result = None diff --git a/sample_archive/cdx/iana.cdx.gz b/sample_archive/cdx/iana.cdx.gz deleted file mode 100644 index 11499ca5a26b931c02b70f48030e7b2d30fee9ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3785 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