8000 Lint fixes · Gurry-12/firebase-admin-python@571e575 · GitHub
[go: up one dir, main page]
Skip to content

Commit 571e575

Browse files
pragatimodipragatimodi
committed
Lint fixes
1 parent 4699d49 commit 571e575

File tree

3 files changed

+118
-80
lines changed

3 files changed

+118
-80
lines changed

‎firebase_admin/tenant_mgt.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ def get_tenant(self, tenant_id):
274274
if not isinstance(tenant_id, str) or not tenant_id:
275275
raise ValueError(
276276
'Invalid tenant ID: {0}. Tenant ID must be a non-empty string.'.format(tenant_id))
277+
277278
try:
278279
body = self.client.body('get', '/tenants/{0}'.format(tenant_id))
279280
except requests.exceptions.RequestException as error:

‎tests/test_project_config_mgt.py

Lines changed: 55 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
}
3838
}
3939
]
40-
}
40+
}
4141
}"""
4242

4343
MOCK_GET_USER_RESPONSE = testutils.resource('get_user.json')
@@ -49,7 +49,7 @@
4949
@pytest.fixture(scope='module')
5050
def project_config_mgt_app():
5151
app = firebase_admin.initialize_app(
52-
testutils.MockCredential(), name='projectMgt',options={'projectId': 'project-id'})
52+
testutils.MockCredential(), name='projectMgt', options={'projectId': 'project-id'})
5353
yield app
5454
firebase_admin.delete_app(app)
5555

@@ -87,7 +87,7 @@ def test_project(self):
8787
}
8888
}
8989
project = project_config_mgt.Project(data)
90-
_assert_project(project)
90+
_assert_project(project)
9191

9292
def test_project_optional_params(self):
9393
data = {
@@ -100,7 +100,8 @@ def test_project_optional_params(self):
100100
class TestGetProject:
101101

102102
def test_get_project(self, project_config_mgt_app):
103-
_, recorder = _instrument_project_config_mgt(project_config_mgt_app, 200, GET_PROJECT_RESPONSE)
103+
_, recorder = _instrument_project_config_mgt(
104+
project_config_mgt_app, 200, GET_PROJECT_RESPONSE)
104105
project = project_config_mgt.get_project(app=project_config_mgt_app)
105106

106107
_assert_project(project)
@@ -121,7 +122,8 @@ def test_update_project_no_args(self, project_config_mgt_app):
121122
def test_update_project_invalid_mfa_config_type(self, mfa_config, project_config_mgt_app):
122123
with pytest.raises(ValueError) as excinfo:
123124
project_config_mgt.update_project(mfa=mfa_config, app=project_config_mgt_app)
124-
assert str(excinfo.value).startswith('multiFactorConfig should be of valid type MultiFactorConfig')
125+
assert str(excinfo.value).startswith(
126+
'multiFactorConfig should be of valid type MultiFactorConfig')
125127

126128
def test_invalid_multi_factor_config_params(self, project_config_mgt_app):
127129
with pytest.raises(ValueError) as excinfo:
@@ -136,41 +138,44 @@ def test_update_project_undefined_mfa_config_state(self, project_config_mgt_app)
136138
with pytest.raises(ValueError) as excinfo:
137139
project_config_mgt.update_project(mfa=mfa_config, app=project_config_mgt_app)
138140
assert str(excinfo.value).startswith('multiFactorConfig.state should be defined')
139-
140141
@pytest.mark.parametrize('state', ['', 1, True, False, [], (), {}, "foo"])
141142
def test_update_project_invalid_mfa_config_state(self, project_config_mgt_app, state):
142143
mfa_config = {'state': state}
143144
with pytest.raises(ValueError) as excinfo:
144145
project_config_mgt.update_project(mfa=mfa_config, app=project_config_mgt_app)
145-
assert str(excinfo.value).startswith('multiFactorConfig.state must be either "ENABLED" or "DISABLED"')
146+
assert str(excinfo.value).startswith(
147+
'multiFactorConfig.state must be either "ENABLED" or "DISABLED"')
146148

147149
@pytest.mark.parametrize('factor_ids', [True, False, 1, 0, 'foo', {}, dict(), tuple(), list()])
148150
def test_invalid_mfa_config_factor_ids_type(self, factor_ids, project_config_mgt_app):
149151
mfa_config = {'state': &# 3420 39;ENABLED', 'factorIds': factor_ids}
150152
with pytest.raises(ValueError) as excinfo:
151-
project_config_mgt.update_project( mfa=mfa_config, app=project_config_mgt_app)
152-
assert str(excinfo.value).startswith('multiFactorConfig.factorIds must be a defined list of AuthFactor type strings')
153+
project_config_mgt.update_project(mfa=mfa_config, app=project_config_mgt_app)
154+
assert str(excinfo.value).startswith(
155+
'multiFactorConfig.factorIds must be a defined list of AuthFactor type strings')
153156

154157
@pytest.mark.parametrize('factor_ids', [[1, 2, 3], [True, False], ['foo', 'bar', {}]])
155158
def test_invalid_mfa_config_factor_ids(self, project_config_mgt_app, factor_ids):
156159
mfa_config = {'state': 'ENABLED', 'factorIds': factor_ids}
157160
with pytest.raises(ValueError) as excinfo:
158-
project_config_mgt.update_project( mfa=mfa_config, app=project_config_mgt_app)
161+
project_config_mgt.update_project(mfa=mfa_config, app=project_config_mgt_app)
159162
assert str(excinfo.value).startswith('factorId must be a valid AuthFactor type string')
160-
161163
@pytest.mark.parametrize('provider_configs', [True, False, 1, 0, list(), tuple(), dict()])
162-
def test_invalid_mfa_config_provider_configs_type(self, project_config_mgt_app, provider_configs):
164+
def test_invalid_mfa_config_provider_configs_type(
165+
self, project_config_mgt_app, provider_configs):
163166
mfa_config = {'state': 'DISABLED', 'providerConfigs': provider_configs}
164167
with pytest.raises(ValueError) as excinfo:
165-
project_config_mgt.update_project( mfa=mfa_config, app=project_config_mgt_app)
166-
assert str(excinfo.value).startswith('multiFactorConfig.providerConfigs must be a valid list of providerConfig types')
167-
168-
@pytest.mark.parametrize('provider_configs', [[True], [{}], [1,2], [{'state': 'DISABLED', 'totpProviderConfig': {}}, "foo"]])
168+
project_config_mgt.update_project(mfa=mfa_config, app=project_config_mgt_app)
169+
assert str(excinfo.value).startswith(
170+
'multiFactorConfig.providerConfigs must be a valid list of providerConfig types')
171+
@pytest.mark.parametrize('provider_configs', [[True], [{}], [1, 2],
172+
[{'state': 'DISABLED', 'totpProviderConfig': {}}, "foo"]])
169173
def test_invalid_mfa_config_provider_config(self, project_config_mgt_app, provider_configs):
170174
mfa_config = {'state': 'DISABLED', 'providerConfigs': provider_configs}
171175
with pytest.raises(ValueError) as excinfo:
172-
project_config_mgt.update_project( mfa=mfa_config, app=project_config_mgt_app)
173-
assert str(excinfo.value).startswith('multiFactorConfigs.providerConfigs must be a valid array of type providerConfig')
176+
project_config_mgt.update_project(mfa=mfa_config, app=project_config_mgt_app)
177+
assert str(excinfo.value).startswith(
178+
'multiFactorConfigs.providerConfigs must be a valid array of type providerConfig')
174179

175180
def test_invalid_provider_config_params(self, project_config_mgt_app):
176181
with pytest.raises(ValueError) as excinfo:
@@ -188,30 +193,33 @@ def test_invalid_provider_config_params(self, project_config_mgt_app):
188193
def test_undefined_provider_config_state(self, project_config_mgt_app):
189194
mfa_config = {'state': 'DISABLED', 'providerConfigs': [{'totpProviderConfig':{}}]}
190195
with pytest.raises(ValueError) as excinfo:
191-
project_config_mgt.update_project( mfa=mfa_config, app=project_config_mgt_app)
196+
project_config_mgt.update_project(mfa=mfa_config, app=project_config_mgt_app)
192197
assert str(excinfo.value).startswith('providerConfig.state should be defined')
193-
194198
@pytest.mark.parametrize('state', ['', 1, True, False, [], (), {}, "foo"])
195199
def test_invalid_provider_config_state(self, project_config_mgt_app, state):
196-
mfa_config = {'state': 'DISABLED', 'providerConfigs': [{'state':state, 'totpProviderConfig':{}}]}
200+
mfa_config = {'state': 'DISABLED',
201+
'providerConfigs': [{'state':state, 'totpProviderConfig':{}}]}
197202
with pytest.raises(ValueError) as excinfo:
198-
project_config_mgt.update_project( mfa=mfa_config, app=project_config_mgt_app)
199-
assert str(excinfo.value).startswith('providerConfig.state must be either "ENABLED" or "DISABLED"')
203+
project_config_mgt.update_project(mfa=mfa_config, app=project_config_mgt_app)
204+
assert str(excinfo.value).startswith(
205+
'providerConfig.state must be either "ENABLED" or "DISABLED"')
200206

201-
@pytest.mark.parametrize('state', ['ENABLED','DISABLED'])
207+
@pytest.mark.parametrize('state', ['ENABLED', 'DISABLED'])
202208
def test_undefined_totp_provider_config(self, project_config_mgt_app, state):
203209
mfa_config = {'state': 'DISABLED', 'providerConfigs': [{'state':state}]}
204210
with pytest.raises(ValueError) as excinfo:
205-
project_config_mgt.update_project( mfa=mfa_config, app=project_config_mgt_app)
206-
assert str(excinfo.value).startswith('providerConfig.totpProviderConfig must be instantiated')
211+
project_config_mgt.update_project(mfa=mfa_config, app=project_config_mgt_app)
212+
assert str(excinfo.value).startswith(
213+
'providerConfig.totpProviderConfig must be instantiated')
207214

208215
@pytest.mark.parametrize('totp_provider_config', [True, False, 1, 0, list(), tuple()])
209216
def test_invalid_totp_provider_config_type(self, project_config_mgt_app, totp_provider_config):
210-
mfa_config = {'state': 'DISABLED', 'providerConfigs': [{'state':'ENABLED', 'totpProviderConfig':totp_provider_config}]}
217+
mfa_config = {'state': 'DISABLED',
218+
'providerConfigs': [{'state':'ENABLED', 'totpProviderConfig':totp_provider_config}]}
211219
with pytest.raises(ValueError) as excinfo:
212-
project_config_mgt.update_project( mfa=mfa_config, app=project_config_mgt_app)
213-
assert str(excinfo.value).startswith('providerConfig.totpProviderConfig must be of valid type TotpProviderConfig')
214-
220+
project_config_mgt.update_project(mfa=mfa_config, app=project_config_mgt_app)
221+
assert str(excinfo.value).startswith(
222+
'providerConfig.totpProviderConfig must be of valid type TotpProviderConfig')
215223
def test_invalid_totp_provider_config_params(self, project_config_mgt_app):
216224
with pytest.raises(ValueError) as excinfo:
217225
project_config_mgt.update_project(mfa={
@@ -227,16 +235,18 @@ def test_invalid_totp_provider_config_params(self, project_config_mgt_app):
227235
],
228236
}, app=project_config_mgt_app)
229237
assert str(excinfo.value).startswith('invalid is not a valid TotpProviderConfig paramter')
230-
231238
@pytest.mark.parametrize('adjacent_intervals', ['', -1, True, False, [], (), {}, "foo", None])
232239
def test_invalid_adjacent_intervals_type(self, project_config_mgt_app, adjacent_intervals):
233-
mfa_config = {'state': 'DISABLED', 'providerConfigs': [{'state':'ENABLED', 'totpProviderConfig':{'adjacentIntervals':adjacent_intervals}}]}
240+
mfa_config = {'state': 'DISABLED', 'providerConfigs':
241+
[{'state':'ENABLED', 'totpProviderConfig':{'adjacentIntervals':adjacent_intervals}}]}
234242
with pytest.raises(ValueError) as excinfo:
235-
project_config_mgt.update_project( mfa=mfa_config, app=project_config_mgt_app)
236-
assert str(excinfo.value).startswith('totpProviderConfig.adjacentIntervals must be a valid positive integer')
243+
project_config_mgt.update_project(mfa=mfa_config, app=project_config_mgt_app)
244+
assert str(excinfo.value).startswith(
245+
'totpProviderConfig.adjacentIntervals must be a valid positive integer')
237246

238247
def test_update_project(self, project_config_mgt_app):
239-
_, recorder = _instrument_project_config_mgt(project_config_mgt_app, 200, GET_PROJECT_RESPONSE)
248+
_, recorder = _instrument_project_config_mgt(
249+
project_config_mgt_app, 200, GET_PROJECT_RESPONSE)
240250
mfa_config_data = {
241251
'state' : 'ENABLED',
242252
'factorIds':["PHONE_SMS"],
@@ -250,9 +260,9 @@ def test_update_project(self, project_config_mgt_app):
250260
]
251261
}
252262
project = project_config_mgt.update_project(
253-
mfa=mfa_config_data,app=project_config_mgt_app)
263+
mfa=mfa_config_data, app=project_config_mgt_app)
254264

255-
mask = ['mfa.enabledProviders','mfa.providerConfigs','mfa.state']
265+
mask = ['mfa.enabledProviders', 'mfa.providerConfigs', 'mfa.state']
256266

257267
_assert_project(project)
258268
self._assert_request(recorder, {
@@ -285,7 +295,8 @@ def test_update_project_valid_mfa_configs(self, project_config_mgt_app):
285295
}
286296

287297
#multiFactorConfig.state is disabled
288-
_, recorder = _instrument_project_config_mgt(project_config_mgt_app, 200, GET_PROJECT_RESPONSE)
298+
_, recorder = _instrument_project_config_mgt(
299+
project_config_mgt_app, 200, GET_PROJECT_RESPONSE)
289300
mfa_config_state_disabled = copy(mfa_config_data)
290301
mfa_config_state_disabled['state'] = 'DISABLED'
291302
project = project_config_mgt.update_project(
@@ -295,13 +306,14 @@ def test_update_project_valid_mfa_configs(self, project_config_mgt_app):
295306
_assert_project(project)
296307
mfa_config_state_disabled['enabledProviders'] = mfa_config_state_disabled['factorIds']
297308
mfa_config_state_disabled.pop('factorIds')
298-
mask = ['mfa.enabledProviders','mfa.providerConfigs','mfa.state']
309+
mask = ['mfa.enabledProviders', 'mfa.providerConfigs', 'mfa.state']
299310
self._assert_request(recorder, {
300311
'mfa': mfa_config_state_disabled
301312
}, mask)
302313

303314
#multiFactorConfig.state enabled and providerConfig.state disabled
304-
_, recorder = _instrument_project_config_mgt(project_config_mgt_app, 200, GET_PROJECT_RESPONSE)
315+
_, recorder = _instrument_project_config_mgt(
316+
project_config_mgt_app, 200, GET_PROJECT_RESPONSE)
305317
mfa_config_state_enabled_totp_disabled = copy(mfa_config_data)
306318
mfa_config_state_enabled_totp_disabled['providerConfigs'][0]['state'] = 'DISABLED'
307319
project = project_config_mgt.update_project(
@@ -311,10 +323,10 @@ def test_update_project_valid_mfa_configs(self, project_config_mgt_app):
311323
_assert_project(project)
312324
mfa_config_state_enabled_totp_disabled['enabledProviders'] = mfa_config_state_enabled_totp_disabled['factorIds']
313325
mfa_config_state_enabled_totp_disabled.pop('factorIds')
314-
mask = ['mfa.enabledProviders','mfa.providerConfigs','mfa.state']
326+
mask = ['mfa.enabledProviders', 'mfa.providerConfigs', 'mfa.state']
315327
self._assert_request(recorder, {
316328
'mfa': mfa_config_state_enabled_totp_disabled
317-
},mask)
329+
}, mask)
318330

319331
def _assert_request(self, recorder, body, mask):
320332
assert len(recorder) == 1
@@ -331,4 +343,4 @@ def _assert_project(project):
331343
assert project.mfa.enabled_providers == ['PHONE_SMS']
332344
assert len(project.mfa.provider_configs) == 1
333345
assert project.mfa.provider_configs[0].state == 'ENABLED'
334-
assert project.mfa.provider_configs[0].totp_provider_config.adjacent_intervals == 5
346+
assert project.mfa.provider_configs[0].totp_provider_config.adjacent_intervals == 5

0 commit comments

Comments
 (0)
0