small fixes in unit tests

Author: blankdots

beacon_api/utils/validate.py

@@ -206,7 +206,7 @@ async def token_middleware(request, handler):
                 raise BeaconUnauthorised(obj, request.host, "invalid_token", f'Expired signature: {e}')  # pragma: no cover
             except InvalidClaimError as e:
                 raise BeaconForbidden(obj, request.host, f'Token info not corresponding with claim: {e}')  # pragma: no cover
-            except InvalidTokenError as e:
+            except InvalidTokenError as e:  # pragma: no cover
                 raise BeaconUnauthorised(obj, request.host, "invalid_token", f'Invalid authorization token: {e}')  # pragma: no cover
         else:
             request["token"] = {"bona_fide_status": False,

tests/test_basic.py

@@ -6,14 +6,9 @@
 from beacon_api.utils.validate import token_scheme_check, verify_aud_claim
 from beacon_api.permissions.ga4gh import get_ga4gh_controlled, get_ga4gh_bona_fide, validate_passport
 from beacon_api.permissions.ga4gh import check_ga4gh_token, decode_passport, get_ga4gh_permissions
-from deploy.test.mock_auth import generate_token
-from .test_app import PARAMS
+from .test_app import PARAMS, generate_token
 from testfixtures import TempDirectory
 from test.support import EnvironmentVarGuard
-# Hack to import a function from beyond top-level package
-# used for test_decode_passport() to get a real token
-import sys
-sys.path.append("..")
 
 
 def mock_token(bona_fide, permissions, auth):
@@ -368,19 +363,21 @@ async def test_ga4gh_bona_fide(self):
 
     @asynctest.mock.patch('beacon_api.permissions.ga4gh.get_jwk')
     @asynctest.mock.patch('beacon_api.permissions.ga4gh.jwt')
-    async def test_validate_passport(self, m_jwt, m_jwk):
+    @asynctest.mock.patch('beacon_api.permissions.ga4gh.LOG')
+    async def test_validate_passport(self, mock_log, m_jwt, m_jwk):
         """Test passport validation."""
         m_jwk.return_value = 'jwk'
         # Test: validation passed
         m_jwt.return_value = MockDecodedPassport()
         await validate_passport({})
-        #
-        # This test doesn't work
-        #
+
         # # Test: validation failed
-        # m_jwt.return_value = MockDecodedPassport(validated=False)
+        m_jwt.return_value = MockDecodedPassport(validated=False)
         # with self.assertRaises(Exception):
-        #     await validate_passport({})
+        await validate_passport({})
+        # we are not raising the exception we are just doing a log
+        # need to assert the log called
+        mock_log.error.assert_called_with("Something went wrong when processing JWT tokens: 1")
 
     @asynctest.mock.patch('beacon_api.permissions.ga4gh.get_ga4gh_permissions')
     async def test_check_ga4gh_token(self, m_get_perms):
@@ -404,9 +401,9 @@ async def test_check_ga4gh_token(self, m_get_perms):
 
     async def test_decode_passport(self):
         """Test key-less JWT decoding."""
-        _, token, _ = generate_token()
+        token, _ = generate_token('http://test.csc.fi')
         header, payload = await decode_passport(token)
-        self.assertEqual(header.get('alg'), 'RS256')
+        self.assertEqual(header.get('alg'), 'HS256')
         self.assertEqual(payload.get('iss'), 'http://test.csc.fi')
 
     @asynctest.mock.patch('beacon_api.permissions.ga4gh.get_ga4gh_bona_fide')

tests/test_db_load.py

@@ -308,7 +308,7 @@ async def test_load_datafile(self, db_mock, mock_log):
     @asynctest.mock.patch('beacon_api.utils.db_load.LOG')
     @asynctest.mock.patch('beacon_api.utils.db_load.asyncpg.connect')
     async def test_insert_variants(self, db_mock, mock_log):
-        """Test load_datafile."""
+        """Test insert variants."""
         db_mock.return_value = Connection()
         await self._db.connection()
         db_mock.assert_called()

tests/test_response.py

@@ -164,6 +164,12 @@ async def test_get_jwk(self, m):
         self.assertTrue(isinstance(result, dict))
         self.assertTrue(result["keys"][0]['alg'], 'RSA256')
 
+    @asynctest.mock.patch('beacon_api.permissions.ga4gh.LOG')
+    async def test_get_jwk_bad(self, mock_log):
+        """Test get JWK exception log."""
+        await get_jwk('http://test.csc.fi/jwk')
+        mock_log.error.assert_called_with("Could not retrieve JWK from http://test.csc.fi/jwk")
+
     @asynctest.mock.patch('beacon_api.utils.validate.OAUTH2_CONFIG', return_value={'server': None})
     async def test_bad_get_key(self, oauth_none):
         """Test bad test_get_key."""