From 9f2696c2a12d8b062603b5f288bed7e0aa28b663 Mon Sep 17 00:00:00 2001 From: Matt Jia Date: Apr 10 2017 06:54:47 +0000 Subject: [PATCH 1/2] update spec file to include python-flask-oidc --- diff --git a/waiverdb.spec b/waiverdb.spec index cb6540e..b2d7425 100644 --- a/waiverdb.spec +++ b/waiverdb.spec @@ -20,6 +20,7 @@ BuildRequires: pytest BuildRequires: python-mock BuildRequires: pytest BuildRequires: fedmsg +BuildRequires: python-flask-oidc BuildArch: noarch Requires: python-flask Requires: python-sqlalchemy @@ -28,6 +29,7 @@ Requires: python-flask-sqlalchemy Requires: python-kerberos Requires: python-mock Requires: fedmsg +Requires: python-flask-oidc %description WaiverDB is a companion service to ResultsDB, for recording waivers against test results. From c6120614c5abfda357781e201bde596d3f35e39c Mon Sep 17 00:00:00 2001 From: Matt Jia Date: Apr 10 2017 06:54:47 +0000 Subject: [PATCH 2/2] tests: improve the assertions --- diff --git a/tests/test_auth.py b/tests/test_auth.py index cbc5963..1969a2e 100644 --- a/tests/test_auth.py +++ b/tests/test_auth.py @@ -67,7 +67,7 @@ class TestOIDCAuthentication(object): with pytest.raises(Unauthorized) as excinfo: request = mock.MagicMock() waiverdb.auth.get_user(request) - assert "No 'Authorization' header found" in str(excinfo.value) + assert "No 'Authorization' header found" in excinfo.value.get_description() @mock.patch.object(flask_oidc.OpenIDConnect, '_get_token_info') def test_get_user_with_invalid_token(self, mocked_get_token, session): @@ -83,7 +83,7 @@ class TestOIDCAuthentication(object): request.headers.__contains__.side_effect = headers.__contains__ with pytest.raises(Unauthorized) as excinfo: waiverdb.auth.get_user(request) - assert 'Token required but invalid' in str(excinfo.value) + assert 'Token required but invalid' in excinfo.value.get_description() @mock.patch.object(flask_oidc.OpenIDConnect, '_get_token_info') def test_get_user_good(self, mocked_get_token, session):