chore: fix integration test lint

Author: jonathanedey

integration/conftest.py

@@ -36,7 +36,7 @@ def _get_cert_path(request):
 
 def integration_conf(request):
     cert_path = _get_cert_path(request)
-    with open(cert_path) as cert:
+    with open(cert_path, encoding='utf-8') as cert:
         project_id = json.load(cert).get('project_id')
     if not project_id:
         raise ValueError('Failed to determine project ID from service account certificate.')
@@ -57,8 +57,8 @@ def default_app(request):
     """
     cred, project_id = integration_conf(request)
     ops = {
-        'databaseURL' : 'https://{0}.firebaseio.com'.format(project_id),
-        'storageBucket' : '{0}.appspot.com'.format(project_id)
+        'databaseURL' : f'https://{project_id}.firebaseio.com',
+        'storageBucket' : f'{project_id}.appspot.com'
     }
     return firebase_admin.initialize_app(cred, ops)
 
@@ -68,5 +68,5 @@ def api_key(request):
     if not path:
         raise ValueError('API key file not specified. Make sure to specify the "--apikey" '
                          'command-line option.')
-    with open(path) as keyfile:
+    with open(path, encoding='utf-8') as keyfile:
         return keyfile.read().strip()

integration/test_auth.py

@@ -30,6 +30,7 @@
 import firebase_admin
 from firebase_admin import auth
 from firebase_admin import credentials
+from firebase_admin._http_client import DEFAULT_TIMEOUT_SECONDS as timeout
 
 
 _verify_token_url = 'https://www.googleapis.com/identitytoolkit/v3/relyingparty/verifyCustomToken'
@@ -67,14 +68,14 @@
 def _sign_in(custom_token, api_key):
     body = {'token' : custom_token.decode(), 'returnSecureToken' : True}
     params = {'key' : api_key}
-    resp = requests.request('post', _verify_token_url, params=params, json=body)
+    resp = requests.request('post', _verify_token_url, params=params, json=body, timeout=timeout)
     resp.raise_for_status()
     return resp.json().get('idToken')
 
 def _sign_in_with_password(email, password, api_key):
     body = {'email': email, 'password': password, 'returnSecureToken': True}
     params = {'key' : api_key}
-    resp = requests.request('post', _verify_password_url, params=params, json=body)
+    resp = requests.request('post', _verify_password_url, params=params, json=body, timeout=timeout)
     resp.raise_for_status()
     return resp.json().get('idToken')
 
@@ -84,7 +85,7 @@ def _random_string(length=10):
 
 def _random_id():
     random_id = str(uuid.uuid4()).lower().replace('-', '')
-    email = 'test{0}@example.{1}.com'.format(random_id[:12], random_id[12:])
+    email = f'test{random_id[:12]}@example.{random_id[12:]}.com'
     return random_id, email
 
 def _random_phone():
@@ -93,21 +94,21 @@ def _random_phone():
 def _reset_password(oob_code, new_password, api_key):
     body = {'oobCode': oob_code, 'newPassword': new_password}
     params = {'key' : api_key}
-    resp = requests.request('post', _password_reset_url, params=params, json=body)
+    resp = requests.request('post', _password_reset_url, params=params, json=body, timeout=timeout)
     resp.raise_for_status()
     return resp.json().get('email')
 
 def _verify_email(oob_code, api_key):
     body = {'oobCode': oob_code}
     params = {'key' : api_key}
-    resp = requests.request('post', _verify_email_url, params=params, json=body)
+    resp = requests.request('post', _verify_email_url, params=params, json=body, timeout=timeout)
     resp.raise_for_status()
     return resp.json().get('email')
 
 def _sign_in_with_email_link(email, oob_code, api_key):
     body = {'oobCode': oob_code, 'email': email}
     params = {'key' : api_key}
-    resp = requests.request('post', _email_sign_in_url, params=params, json=body)
+    resp = requests.request('post', _email_sign_in_url, params=params, json=body, timeout=timeout)
     resp.raise_for_status()
     return resp.json().get('idToken')
 
@@ -870,7 +871,7 @@ def test_delete_saml_provider_config():
 
 
 def _create_oidc_provider_config():
-    provider_id = 'oidc.{0}'.format(_random_string())
+    provider_id = f'oidc.{_random_string()}'
     return auth.create_oidc_provider_config(
         provider_id=provider_id,
         client_id='OIDC_CLIENT_ID',
@@ -882,7 +883,7 @@ def _create_oidc_provider_config():
 
 
 def _create_saml_provider_config():
-    provider_id = 'saml.{0}'.format(_random_string())
+    provider_id = f'saml.{_random_string()}'
     return auth.create_saml_provider_config(
         provider_id=provider_id,
         idp_entity_id='IDP_ENTITY_ID',

integration/test_db.py

@@ -39,7 +39,7 @@ def integration_conf(request):
 def app(request):
     cred, project_id = integration_conf(request)
     ops = {
-        'databaseURL' : 'https://{0}.firebaseio.com'.format(project_id),
+        'databaseURL' : f'https://{project_id}.firebaseio.com',
     }
     return firebase_admin.initialize_app(cred, ops, name='integration-db')
 
@@ -53,7 +53,7 @@ def default_app():
 
 @pytest.fixture(scope='module')
 def update_rules(app):
-    with open(testutils.resource_filename('dinosaurs_index.json')) as rules_file:
+    with open(testutils.resource_filename('dinosaurs_index.json'), encoding='utf-8') as rules_file:
         new_rules = json.load(rules_file)
     client = db.reference('', app)._client
     rules = client.body('get', '/.settings/rules.json', params='format=strict')
@@ -64,7 +64,7 @@ def update_rules(app):
 
 @pytest.fixture(scope='module')
 def testdata():
-    with open(testutils.resource_filename('dinosaurs.json')) as dino_file:
+    with open(testutils.resource_filename('dinosaurs.json'), encoding='utf-8') as dino_file:
         return json.load(dino_file)
 
 @pytest.fixture(scope='module')
@@ -195,8 +195,8 @@ def test_update_nested_children(self, testref):
         edward = python.child('users').push({'name' : 'Edward Cope', 'since' : 1800})
         jack = python.child('users').push({'name' : 'Jack Horner', 'since' : 1940})
         delta = {
-            '{0}/since'.format(edward.key) : 1840,
-            '{0}/since'.format(jack.key) : 1946
+            f'{edward.key}/since' : 1840,
+            f'{jack.key}/since' : 1946
         }
         python.child('users').update(delta)
         assert edward.get() == {'name' : 'Edward Cope', 'since' : 1840}
@@ -363,7 +363,7 @@ def override_app(request, update_rules):
     del update_rules
     cred, project_id = integration_conf(request)
     ops = {
-        'databaseURL' : 'https://{0}.firebaseio.com'.format(project_id),
+        'databaseURL' : f'https://{project_id}.firebaseio.com',
         'databaseAuthVariableOverride' : {'uid' : 'user1'}
     }
     app = firebase_admin.initialize_app(cred, ops, 'db-override')
@@ -375,7 +375,7 @@ def none_override_app(request, update_rules):
     del update_rules
     cred, project_id = integration_conf(request)
     ops = {
-        'databaseURL' : 'https://{0}.firebaseio.com'.format(project_id),
+        'databaseURL' : f'https://{project_id}.firebaseio.com',
         'databaseAuthVariableOverride' : None
     }
     app = firebase_admin.initialize_app(cred, ops, 'db-none-override')

integration/test_firestore.py

@@ -18,25 +18,25 @@
 from firebase_admin import firestore
 
 _CITY = {
-        'name': u'Mountain View',
-        'country': u'USA',
+        'name': 'Mountain View',
+        'country': 'USA',
         'population': 77846,
         'capital': False
     }
 
 _MOVIE = {
-        'Name': u'Interstellar',
+        'Name': 'Interstellar',
         'Year': 2014,
-        'Runtime': u'2h 49m',
+        'Runtime': '2h 49m',
         'Academy Award Winner': True
     }
 
 
 def test_firestore():
     client = firestore.client()
     expected = {
-        'name': u'Mountain View',
-        'country': u'USA',
+        'name': 'Mountain View',
+        'country': 'USA',
         'population': 77846,
         'capital': False
     }
@@ -93,7 +93,7 @@ def test_firestore_multi_db():
 def test_server_timestamp():
     client = firestore.client()
     expected = {
-        'name': u'Mountain View',
+        'name': 'Mountain View',
         'timestamp': firestore.SERVER_TIMESTAMP # pylint: disable=no-member
     }
     doc = client.collection('cities').document()

integration/test_firestore_async.py

@@ -20,16 +20,16 @@
 from firebase_admin import firestore_async
 
 _CITY = {
-        'name': u'Mountain View',
-        'country': u'USA',
+        'name': 'Mountain View',
+        'country': 'USA',
         'population': 77846,
         'capital': False
     }
 
 _MOVIE = {
-        'Name': u'Interstellar',
+        'Name': 'Interstellar',
         'Year': 2014,
-        'Runtime': u'2h 49m',
+        'Runtime': '2h 49m',
         'Academy Award Winner': True
     }
 
@@ -102,7 +102,7 @@ async def test_firestore_async_multi_db():
 async def test_server_timestamp():
     client = firestore_async.client()
     expected = {
-        'name': u'Mountain View',
+        'name': 'Mountain View',
         'timestamp': firestore_async.SERVER_TIMESTAMP # pylint: disable=no-member
     }
     doc = client.collection('cities').document()

integration/test_messaging.py

@@ -121,7 +121,7 @@ def test_send_each():
 def test_send_each_500():
     messages = []
     for msg_number in range(500):
-        topic = 'foo-bar-{0}'.format(msg_number % 10)
+        topic = f'foo-bar-{msg_number % 10}'
         messages.append(messaging.Message(topic=topic))
 
     batch_response = messaging.send_each(messages, dry_run=True)
@@ -193,7 +193,7 @@ async def test_send_each_async():
 async def test_send_each_async_500():
     messages = []
     for msg_number in range(500):
-        topic = 'foo-bar-{0}'.format(msg_number % 10)
+        topic = f'foo-bar-{msg_number % 10}'
         messages.append(messaging.Message(topic=topic))
 
     batch_response = await messaging.send_each_async(messages, dry_run=True)

integration/test_ml.py

@@ -37,7 +37,7 @@
 def _random_identifier(prefix):
     #pylint: disable=unused-variable
     suffix = ''.join([random.choice(string.ascii_letters + string.digits) for n in range(8)])
-    return '{0}_{1}'.format(prefix, suffix)
+    return f'{prefix}_{suffix}'
 
 
 NAME_ONLY_ARGS = {
@@ -170,7 +170,7 @@ def test_create_already_existing_fails(firebase_model):
         ml.create_model(model=firebase_model)
     check_operation_error(
         excinfo,
-        'Model \'{0}\' already exists'.format(firebase_model.display_name))
+        f'Model \'{firebase_model.display_name}\' already exists')
 
 
 @pytest.mark.parametrize('firebase_model', [INVALID_FULL_MODEL_ARGS], indirect=True)
@@ -219,7 +219,7 @@ def test_update_non_existing_model(firebase_model):
         ml.update_model(firebase_model)
     check_operation_error(
         excinfo,
-        'Model \'{0}\' was not found'.format(firebase_model.as_dict().get('name')))
+        f'Model \'{firebase_model.as_dict().get("name")}\' was not found')
 
 
 @pytest.mark.parametrize('firebase_model', [FULL_MODEL_ARGS], indirect=True)
@@ -252,18 +252,17 @@ def test_publish_unpublish_non_existing_model(firebase_model):
         ml.publish_model(firebase_model.model_id)
     check_operation_error(
         excinfo,
-        'Model \'{0}\' was not found'.format(firebase_model.as_dict().get('name')))
+        f'Model \'{firebase_model.as_dict().get("name")}\' was not found')
 
     with pytest.raises(exceptions.NotFoundError) as excinfo:
         ml.unpublish_model(firebase_model.model_id)
     check_operation_error(
         excinfo,
-        'Model \'{0}\' was not found'.format(firebase_model.as_dict().get('name')))
+        f'Model \'{firebase_model.as_dict().get("name")}\' was not found')
 
 
 def test_list_models(model_list):
-    filter_str = 'displayName={0} OR tags:{1}'.format(
-        model_list[0].display_name, model_list[1].tags[0])
+    filter_str = f'displayName={model_list[0].display_name} OR tags:{model_list[1].tags[0]}'
 
     all_models = ml.list_models(list_filter=filter_str)
     all_model_ids = [mdl.model_id for mdl in all_models.iterate_all()]

integration/test_project_management.py

@@ -74,14 +74,13 @@ def test_create_android_app_already_exists(android_app):
 def test_android_set_display_name_and_get_metadata(android_app, project_id):
     app_id = android_app.app_id
     android_app = project_management.android_app(app_id)
-    new_display_name = '{0} helloworld {1}'.format(
-        TEST_APP_DISPLAY_NAME_PREFIX, random.randint(0, 10000))
+    new_display_name = f'{TEST_APP_DISPLAY_NAME_PREFIX} helloworld {random.randint(0, 10000)}'
 
     android_app.set_display_name(new_display_name)
     metadata = project_management.android_app(app_id).get_metadata()
     android_app.set_display_name(TEST_APP_DISPLAY_NAME_PREFIX)  # Revert the display name.
 
-    assert metadata._name == 'projects/{0}/androidApps/{1}'.format(project_id, app_id)
+    assert metadata._name == f'projects/{project_id}/androidApps/{app_id}'
     assert metadata.app_id == app_id
     assert metadata.project_id == project_id
     assert metadata.display_name == new_display_name
@@ -149,15 +148,13 @@ def test_create_ios_app_already_exists(ios_app):
 def test_ios_set_display_name_and_get_metadata(ios_app, project_id):
     app_id = ios_app.app_id
     ios_app = project_management.ios_app(app_id)
-    new_display_name = '{0} helloworld {1}'.format(
-        TEST_APP_DISPLAY_NAME_PREFIX, random.randint(0, 10000))
+    new_display_name = f'{TEST_APP_DISPLAY_NAME_PREFIX} helloworld {random.randint(0, 10000)}'
 
     ios_app.set_display_name(new_display_name)
     metadata = project_management.ios_app(app_id).get_metadata()
     ios_app.set_display_name(TEST_APP_DISPLAY_NAME_PREFIX)  # Revert the display name.
 
-    assert metadata._name == 'projects/{0}/iosApps/{1}'.format(project_id, app_id)
-    assert metadata.app_id == app_id
+    assert metadata._name == f'projects/{project_id}/iosApps/{app_id}'
     assert metadata.project_id == project_id
     assert metadata.display_name == new_display_name
     assert metadata.bundle_id == TEST_APP_BUNDLE_ID

integration/test_storage.py

@@ -20,10 +20,10 @@
 
 def test_default_bucket(project_id):
     bucket = storage.bucket()
-    _verify_bucket(bucket, '{0}.appspot.com'.format(project_id))
+    _verify_bucket(bucket, f'{project_id}.appspot.com')
 
 def test_custom_bucket(project_id):
-    bucket_name = '{0}.appspot.com'.format(project_id)
+    bucket_name = f'{project_id}.appspot.com'
     bucket = storage.bucket(bucket_name)
     _verify_bucket(bucket, bucket_name)
 
@@ -33,7 +33,7 @@ def test_non_existing_bucket():
 
 def _verify_bucket(bucket, expected_name):
     assert bucket.name == expected_name
-    file_name = 'data_{0}.txt'.format(int(time.time()))
+    file_name = f'data_{int(time.time())}.txt'
     blob = bucket.blob(file_name)
     blob.upload_from_string('Hello World')
 

integration/test_tenant_mgt.py

@@ -25,6 +25,7 @@
 
 from firebase_admin import auth
 from firebase_admin import tenant_mgt
+from firebase_admin._http_client import DEFAULT_TIMEOUT_SECONDS as timeout
 from integration import test_auth
 
 
@@ -359,7 +360,7 @@ def test_delete_saml_provider_config(sample_tenant):
 
 
 def _create_oidc_provider_config(client):
-    provider_id = 'oidc.{0}'.format(_random_string())
+    provider_id = f'oidc.{_random_string()}'
     return client.create_oidc_provider_config(
         provider_id=provider_id,
         client_id='OIDC_CLIENT_ID',
@@ -369,7 +370,7 @@ def _create_oidc_provider_config(client):
 
 
 def _create_saml_provider_config(client):
-    provider_id = 'saml.{0}'.format(_random_string())
+    provider_id = f'saml.{_random_string()}'
     return client.create_saml_provider_config(
         provider_id=provider_id,
         idp_entity_id='IDP_ENTITY_ID',
@@ -387,7 +388,7 @@ def _random_uid():
 
 def _random_email():
     random_id = str(uuid.uuid4()).lower().replace('-', '')
-    return 'test{0}@example.{1}.com'.format(random_id[:12], random_id[12:])
+    return f'test{random_id[:12]}@example.{random_id[12:]}.com'
 
 
 def _random_phone():
@@ -412,6 +413,6 @@ def _sign_in(custom_token, tenant_id, api_key):
         'tenantId': tenant_id,
     }
     params = {'key' : api_key}
-    resp = requests.request('post', VERIFY_TOKEN_URL, params=params, json=body)
+    resp = requests.request('post', VERIFY_TOKEN_URL, params=params, json=body, timeout=timeout)
     resp.raise_for_status()
     return resp.json().get('idToken')