backup/warcprox
1
0
Fork 0
mirror of https://github.com/internetarchive/warcprox.git synced 2025-01-18 13:22:09 +01:00
Code Issues Projects Releases Activity

some fixes to make the tests pass

Browse Source
This commit is contained in:
Noah Levitt 2015-11-17 20:38:10 +00:00
parent 82d3ef45a0
commit 073c1fb578
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rethinkstuff/__init__.py
View File

@ -13,7 +13,11 @@ def utcnow():
requires timezone-aware datetime for its native time type, and requires timezone-aware datetime for its native time type, and
unfortunately datetime.datetime.utcnow() is not timezone-aware. Also python unfortunately datetime.datetime.utcnow() is not timezone-aware. Also python
2 doesn't come with a timezone implementation.""" 2 doesn't come with a timezone implementation."""
return datetime.datetime.now(r.make_timezone("00:00")) try:
utc = datetime.timezone.utc
except:
utc = r.make_timezone("00:00")
return datetime.datetime.now(utc)
class RethinkerWrapper(object): class RethinkerWrapper(object):
logger = logging.getLogger('rethinkstuff.RethinkerWrapper') logger = logging.getLogger('rethinkstuff.RethinkerWrapper')

4
tests/run-tests.sh
View File

@ -9,10 +9,12 @@ docker build -t internetarchive/rethinkdb $script_dir
for python in python2.7 python3.4 for python in python2.7 python3.4
do do
docker run --rm -it --volume="$script_dir/..:/rethinkstuff" internetarchive/rethinkdb /sbin/my_init -- \ docker run --rm -it --volume="$script_dir/..:/rethinkstuff" internetarchive/rethinkdb /sbin/my_init -- \
bash -x -c "ls -l /rethinkstuff ; cd /tmp && git clone /rethinkstuff \ bash -x -c "cd /tmp && git clone /rethinkstuff \
&& cd /tmp/rethinkstuff \ && cd /tmp/rethinkstuff \
&& (cd /rethinkstuff && git diff) | patch -p1 \
&& virtualenv -p $python /tmp/venv \ && virtualenv -p $python /tmp/venv \
&& source /tmp/venv/bin/activate \ && source /tmp/venv/bin/activate \
&& tail -20 tests/test_reth* \
&& pip install pytest . \ && pip install pytest . \
&& py.test -v -s tests" && py.test -v -s tests"
done done

14
tests/test_rethinker.py
View File

@ -166,14 +166,18 @@ def test_service_registry(r):
svc1 = svcreg.heartbeat(svc1) svc1 = svcreg.heartbeat(svc1)
assert len(svcreg.available_services("yes-such-role")) == 2 assert len(svcreg.available_services("yes-such-role")) == 2
def test_utcnow(r): def test_utcnow():
now_notz = datetime.datetime.utcnow() # has no timezone :( now_notz = datetime.datetime.utcnow() # has no timezone :(
assert not now_notz.tzinfo assert not now_notz.tzinfo
now_tz = r.utcnow() # solution to that problem now_tz = rethinkstuff.utcnow() # solution to that problem
assert now_tz.tzinfo assert now_tz.tzinfo
assert now_tz.tzinfo.delta == datetime.timedelta(0)
# XXX should really run this test in non-utc timezone environment ## XXX .timestamp() was added in python 3.3
assert now_tz.timestamp() - now_notz.timestamp() < 0.1 # assert now_tz.timestamp() - now_notz.timestamp() < 0.1
## XXX TypeError: can't subtract offset-naive and offset-aware datetimes
# assert abs((now_tz - now_notz).total_seconds()) < 0.1
## XXX what else can we test without jumping through hoops?