From 96319a00594d42525c80a799a1b22b2f77f864ae Mon Sep 17 00:00:00 2001 From: Tanner Prestegard <tanner.prestegard@ligo.org> Date: Fri, 13 Sep 2019 15:28:08 -0500 Subject: [PATCH] Python 3: fix a few tests with decoding response content --- gracedb/api/v1/events/tests/test_eventgraceidfield.py | 2 +- gracedb/api/v1/events/tests/test_update_grbevent_view.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gracedb/api/v1/events/tests/test_eventgraceidfield.py b/gracedb/api/v1/events/tests/test_eventgraceidfield.py index bff49b445..ca2744223 100644 --- a/gracedb/api/v1/events/tests/test_eventgraceidfield.py +++ b/gracedb/api/v1/events/tests/test_eventgraceidfield.py @@ -50,4 +50,4 @@ def test_valid_graceids(graceid): call_args, _ = mock_super_tiv.call_args assert mock_super_tiv.call_count == 1 assert len(call_args) == 1 - assert call_args[0].encode() == graceid.upper().strip() + assert call_args[0] == graceid.upper().strip() diff --git a/gracedb/api/v1/events/tests/test_update_grbevent_view.py b/gracedb/api/v1/events/tests/test_update_grbevent_view.py index 64078c84d..06d68be1e 100644 --- a/gracedb/api/v1/events/tests/test_update_grbevent_view.py +++ b/gracedb/api/v1/events/tests/test_update_grbevent_view.py @@ -147,7 +147,8 @@ def test_update_with_no_new_data(grb_user, internal_group, data): # Check response assert response.status_code == 400 - assert 'Request would not modify the GRB event' in response.content + assert 'Request would not modify the GRB event' \ + in response.content.decode() @pytest.mark.parametrize("data", @@ -176,7 +177,7 @@ def test_update_with_bad_data(grb_user, internal_group, data): # Check response assert response.status_code == 400 - assert 'must be a float' in response.content + assert 'must be a float' in response.content.decode() @pytest.mark.django_db @@ -206,4 +207,4 @@ def test_update_non_grbevent(grb_user, internal_group): # Check response assert response.status_code == 400 assert 'Cannot update GRB event parameters for non-GRB event' \ - in response.content + in response.content.decode() -- GitLab