Commit 2236aaaf authored by Kirill Smelkov's avatar Kirill Smelkov

tidrange: test: Fix for py3

ashex gives bytes, whereas reference_tid was str.
parent 7851a964
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright (C) 2019 Nexedi SA and Contributors. # Copyright (C) 2019-2020 Nexedi SA and Contributors.
# #
# This program is free software: you can Use, Study, Modify and Redistribute # This program is free software: you can Use, Study, Modify and Redistribute
# it under the terms of the GNU General Public License version 3, or (at your # it under the terms of the GNU General Public License version 3, or (at your
...@@ -27,6 +27,7 @@ from freezegun import freeze_time ...@@ -27,6 +27,7 @@ from freezegun import freeze_time
import tzlocal import tzlocal
from zodbtools.util import TidRangeInvalid, TidInvalid, ashex, parse_tid, parse_tidrange from zodbtools.util import TidRangeInvalid, TidInvalid, ashex, parse_tid, parse_tidrange
from golang import b
@pytest.fixture @pytest.fixture
...@@ -94,7 +95,7 @@ def test_parse_tid(): ...@@ -94,7 +95,7 @@ def test_parse_tid():
assert exc.value.args == ('', ) assert exc.value.args == ('', )
test_parameters = [] test_parameters = [] # of (reference_time, reference_tid, input_time)
with open( with open(
os.path.join( os.path.join(
os.path.dirname(__file__), "testdata", os.path.dirname(__file__), "testdata",
...@@ -109,7 +110,7 @@ with open( ...@@ -109,7 +110,7 @@ with open(
test_parameters) test_parameters)
def test_parse_tid_time_format(fake_time, reference_time, reference_tid, def test_parse_tid_time_format(fake_time, reference_time, reference_tid,
input_time): input_time):
assert reference_tid == ashex(parse_tid(input_time)) assert b(reference_tid) == ashex(parse_tid(input_time))
# check that the reference_tid matches the reference time, mainly # check that the reference_tid matches the reference time, mainly
# to check that input is defined correctly. # to check that input is defined correctly.
assert reference_tid == ashex(parse_tid(reference_time)) assert b(reference_tid) == ashex(parse_tid(reference_time))
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment