backup/pywb
1
0
Fork 0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-15 00:03:28 +01:00
Code Issues Projects Releases Activity

misc test fixes: make record_replay tests for consistent, use different url to ensure consistent ordering

Browse Source 
fakeredistests: fix for fakenewredis, clear fakeredis databases and pubsub list
This commit is contained in:
Ilya Kreymer 2018-03-29 21:41:40 -07:00
parent 9da5bd1083
commit 8d9951bc7b
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pywb/warcserver/test/testutils.py
View File

@ -5,7 +5,7 @@ import shutil
import yaml import yaml
import time import time
from fakeredis import FakeStrictRedis from fakeredis import FakeStrictRedis, DATABASES
from mock import patch from mock import patch
from pywb.warcserver.basewarcserver import BaseWarcServer from pywb.warcserver.basewarcserver import BaseWarcServer
@ -64,6 +64,10 @@ class FakeRedisTests(object):
@classmethod @classmethod
def setup_class(cls, redis_url='redis://localhost:6379/2'): def setup_class(cls, redis_url='redis://localhost:6379/2'):
super(FakeRedisTests, cls).setup_class() super(FakeRedisTests, cls).setup_class()
PUBSUBS.clear()
DATABASES.clear()
cls.redismock = patch('redis.StrictRedis', FakeStrictRedisSharedPubSub) cls.redismock = patch('redis.StrictRedis', FakeStrictRedisSharedPubSub)
cls.redismock.start() cls.redismock.start()

16
tests/test_record_replay.py
View File

@ -63,15 +63,15 @@ class TestRecordReplay(CollsDirMixin, BaseConfigTest):
assert '"C": "D"' in res.text assert '"C": "D"' in res.text
def test_record_again_1(self): def test_record_again_1(self):
res = self.testapp.get('/test/record/mp_/http://httpbin.org/get?C=D') res = self.testapp.get('/test/record/mp_/http://httpbin.org/get?C=D2')
assert '"C": "D"' in res.text assert '"C": "D2"' in res.text
def test_replay_again_1(self, fmod): def test_replay_again_1(self, fmod):
self.ensure_empty() self.ensure_empty()
fmod_slash = fmod + '/' if fmod else '' fmod_slash = fmod + '/' if fmod else ''
res = self.get('/test/{0}http://httpbin.org/get?C=D', fmod_slash) res = self.get('/test/{0}http://httpbin.org/get?C=D2', fmod_slash)
assert '"C": "D"' in res.text assert '"C": "D2"' in res.text
assert len(os.listdir(os.path.join(self.root_dir, '_test_colls', 'test', 'archive'))) == 1 assert len(os.listdir(os.path.join(self.root_dir, '_test_colls', 'test', 'archive'))) == 1
@ -104,12 +104,12 @@ class TestRecordReplay(CollsDirMixin, BaseConfigTest):
assert cdxj_lines[0]['url'] == 'http://httpbin.org/get?A=B' assert cdxj_lines[0]['url'] == 'http://httpbin.org/get?A=B'
assert cdxj_lines[1]['url'] == 'http://httpbin.org/get?A=B' assert cdxj_lines[1]['url'] == 'http://httpbin.org/get?A=B'
assert cdxj_lines[2]['url'] == 'http://httpbin.org/get?C=D' assert cdxj_lines[2]['url'] == 'http://httpbin.org/get?C=D'
assert cdxj_lines[3]['url'] == 'http://httpbin.org/get?C=D' assert cdxj_lines[3]['url'] == 'http://httpbin.org/get?C=D2'
assert cdxj_lines[0]['urlkey'] == 'org,httpbin)/get?__pywb_method=head&a=b' assert cdxj_lines[0]['urlkey'] == 'org,httpbin)/get?__pywb_method=head&a=b'
assert cdxj_lines[1]['urlkey'] == 'org,httpbin)/get?a=b' assert cdxj_lines[1]['urlkey'] == 'org,httpbin)/get?a=b'
assert cdxj_lines[2]['urlkey'] == 'org,httpbin)/get?c=d' assert cdxj_lines[2]['urlkey'] == 'org,httpbin)/get?c=d'
assert cdxj_lines[3]['urlkey'] == 'org,httpbin)/get?c=d' assert cdxj_lines[3]['urlkey'] == 'org,httpbin)/get?c=d2'
assert cdxj_lines[0]['source'] == to_path('test/indexes/autoindex.cdxj') assert cdxj_lines[0]['source'] == to_path('test/indexes/autoindex.cdxj')
assert cdxj_lines[1]['source'] == to_path('test/indexes/autoindex.cdxj') assert cdxj_lines[1]['source'] == to_path('test/indexes/autoindex.cdxj')
@ -126,10 +126,10 @@ class TestRecordReplay(CollsDirMixin, BaseConfigTest):
def test_timemap_all_coll(self): def test_timemap_all_coll(self):
res = self.testapp.get('/all/timemap/link/http://httpbin.org/get?C=D') res = self.testapp.get('/all/timemap/link/http://httpbin.org/get?C=D')
link_lines = res.text.rstrip().split('\n') link_lines = res.text.rstrip().split('\n')
assert len(link_lines) == 5 assert len(link_lines) == 4
assert to_path('collection="test2"') in link_lines[3] assert to_path('collection="test2"') in link_lines[3]
assert to_path('collection="test"') in link_lines[4] #assert to_path('collection="test"') in link_lines[4]
# ============================================================================ # ============================================================================