Skip to content

Commit f1b64ed

Browse files
aliabbasrizvialiabbasrizvi
authored
Enforcing more pep8 (#117)
1 parent decbc7b commit f1b64ed

File tree

7 files changed

+130
-146
lines changed

7 files changed

+130
-146
lines changed

‎tests/helpers_tests/test_audience.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,13 @@ def test_is_user_in_experiment__no_audience(self):
5656
def test_is_user_in_experiment__no_attributes(self):
5757
""" Test that is_user_in_experiment returns True when experiment is using no audience. """
5858

59-
self.assertFalse(audience.is_user_in_experiment(self.project_config,
60-
self.project_config.get_experiment_from_key('test_experiment'), None))
59+
self.assertFalse(audience.is_user_in_experiment(
60+
self.project_config, self.project_config.get_experiment_from_key('test_experiment'), None)
61+
)
6162

62-
self.assertFalse(audience.is_user_in_experiment(self.project_config,
63-
self.project_config.get_experiment_from_key('test_experiment'), {}))
63+
self.assertFalse(audience.is_user_in_experiment(
64+
self.project_config, self.project_config.get_experiment_from_key('test_experiment'), {})
65+
)
6466

6567
def test_is_user_in_experiment__audience_conditions_are_met(self):
6668
""" Test that is_user_in_experiment returns True when audience conditions are met. """

‎tests/test_bucketing.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,12 @@ def test_bucket(self):
3838
# Variation 1
3939
with mock.patch('optimizely.bucketer.Bucketer._generate_bucket_value',
4040
return_value=42) as mock_generate_bucket_value:
41-
self.assertEqual(entities.Variation('111128', 'control'),
42-
self.bucketer.bucket(
43-
self.project_config.get_experiment_from_key('test_experiment'),
44-
'test_user', 'test_user'
45-
))
41+
self.assertEqual(
42+
entities.Variation('111128', 'control'),
43+
self.bucketer.bucket(
44+
self.project_config.get_experiment_from_key('test_experiment'),
45+
'test_user', 'test_user'
46+
))
4647
mock_generate_bucket_value.assert_called_once_with('test_user111127')
4748

4849
# Empty entity ID
@@ -56,12 +57,11 @@ def test_bucket(self):
5657
# Variation 2
5758
with mock.patch('optimizely.bucketer.Bucketer._generate_bucket_value',
5859
return_value=5042) as mock_generate_bucket_value:
59-
self.assertEqual(entities.Variation('111129', 'variation'),
60-
self.bucketer.bucket(
61-
self.project_config.get_experiment_from_key('test_experiment'),
62-
'test_user',
63-
'test_user'
64-
))
60+
self.assertEqual(
61+
entities.Variation('111129', 'variation'),
62+
self.bucketer.bucket(
63+
self.project_config.get_experiment_from_key('test_experiment'), 'test_user', 'test_user'
64+
))
6565
mock_generate_bucket_value.assert_called_once_with('test_user111127')
6666

6767
# No matching variation
@@ -165,7 +165,7 @@ def test_bucket(self):
165165

166166
# Variation 1
167167
with mock.patch('optimizely.bucketer.Bucketer._generate_bucket_value', return_value=42),\
168-
mock.patch('optimizely.logger.SimpleLogger.log') as mock_logging:
168+
mock.patch('optimizely.logger.SimpleLogger.log') as mock_logging:
169169
self.assertEqual(entities.Variation('111128', 'control'),
170170
self.bucketer.bucket(self.project_config.get_experiment_from_key('test_experiment'),
171171
'test_user',
@@ -196,7 +196,7 @@ def test_bucket(self):
196196

197197
# Variation 2
198198
with mock.patch('optimizely.bucketer.Bucketer._generate_bucket_value', return_value=5042),\
199-
mock.patch('optimizely.logger.SimpleLogger.log') as mock_logging:
199+
mock.patch('optimizely.logger.SimpleLogger.log') as mock_logging:
200200
self.assertEqual(entities.Variation('111129', 'variation'),
201201
self.bucketer.bucket(self.project_config.get_experiment_from_key('test_experiment'),
202202
'test_user',
@@ -211,7 +211,7 @@ def test_bucket(self):
211211

212212
# No matching variation
213213
with mock.patch('optimizely.bucketer.Bucketer._generate_bucket_value', return_value=424242),\
214-
mock.patch('optimizely.logger.SimpleLogger.log') as mock_logging:
214+
mock.patch('optimizely.logger.SimpleLogger.log') as mock_logging:
215215
self.assertIsNone(self.bucketer.bucket(self.project_config.get_experiment_from_key('test_experiment'),
216216
'test_user',
217217
'test_user'))
@@ -227,7 +227,7 @@ def test_bucket__experiment_in_group(self):
227227
# In group, matching experiment and variation
228228
with mock.patch('optimizely.bucketer.Bucketer._generate_bucket_value',
229229
side_effect=[42, 4242]),\
230-
mock.patch('optimizely.logger.SimpleLogger.log') as mock_logging:
230+
mock.patch('optimizely.logger.SimpleLogger.log') as mock_logging:
231231
self.assertEqual(entities.Variation('28902', 'group_exp_1_variation'),
232232
self.bucketer.bucket(self.project_config.get_experiment_from_key('group_exp_1'),
233233
'test_user',
@@ -248,7 +248,7 @@ def test_bucket__experiment_in_group(self):
248248
# In group, but in no experiment
249249
with mock.patch('optimizely.bucketer.Bucketer._generate_bucket_value',
250250
side_effect=[8400, 9500]),\
251-
mock.patch('optimizely.logger.SimpleLogger.log') as mock_logging:
251+
mock.patch('optimizely.logger.SimpleLogger.log') as mock_logging:
252252
self.assertIsNone(self.bucketer.bucket(self.project_config.get_experiment_from_key('group_exp_1'),
253253
'test_user',
254254
'test_user'))
@@ -261,7 +261,7 @@ def test_bucket__experiment_in_group(self):
261261
# In group, no matching experiment
262262
with mock.patch('optimizely.bucketer.Bucketer._generate_bucket_value',
263263
side_effect=[42, 9500]),\
264-
mock.patch('optimizely.logger.SimpleLogger.log') as mock_logging:
264+
mock.patch('optimizely.logger.SimpleLogger.log') as mock_logging:
265265
self.assertIsNone(self.bucketer.bucket(
266266
self.project_config.get_experiment_from_key('group_exp_1'), 'test_user', 'test_user'))
267267
self.assertEqual(4, mock_logging.call_count)
@@ -277,7 +277,7 @@ def test_bucket__experiment_in_group(self):
277277
# In group, experiment does not match
278278
with mock.patch('optimizely.bucketer.Bucketer._generate_bucket_value',
279279
side_effect=[42, 4242]),\
280-
mock.patch('optimizely.logger.SimpleLogger.log') as mock_logging:
280+
mock.patch('optimizely.logger.SimpleLogger.log') as mock_logging:
281281
self.assertIsNone(self.bucketer.bucket(self.project_config.get_experiment_from_key('group_exp_2'),
282282
'test_user',
283283
'test_user'))
@@ -292,7 +292,7 @@ def test_bucket__experiment_in_group(self):
292292
# In group no matching variation
293293
with mock.patch('optimizely.bucketer.Bucketer._generate_bucket_value',
294294
side_effect=[42, 424242]),\
295-
mock.patch('optimizely.logger.SimpleLogger.log') as mock_logging:
295+
mock.patch('optimizely.logger.SimpleLogger.log') as mock_logging:
296296
self.assertIsNone(self.bucketer.bucket(self.project_config.get_experiment_from_key('group_exp_1'),
297297
'test_user',
298298
'test_user'))

‎tests/test_config.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ def test_init(self):
6262
}, {
6363
'entityId': '111129',
6464
'endOfRange': 9000
65-
}],
66-
'111182'),
65+
}], '111182'),
6766
'group_exp_1': entities.Experiment(
6867
'32222', 'group_exp_1', 'Running', [], [{
6968
'key': 'group_exp_1_control',
@@ -425,8 +424,7 @@ def test_init__with_v4_datafile(self):
425424
}, {
426425
'entityId': '111129',
427426
'endOfRange': 9000
428-
}],
429-
'111182'),
427+
}], '111182'),
430428
'group_exp_1': entities.Experiment(
431429
'32222', 'group_exp_1', 'Running', [], [{
432430
'key': 'group_exp_1_control',

‎tests/test_decision_service.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@ def test_get_variation__user_has_stored_decision(self):
171171
# Assert that stored variation is returned and bucketing service is not involved
172172
mock_get_forced_variation.assert_called_once_with(experiment, 'test_user')
173173
mock_lookup.assert_called_once_with('test_user')
174-
mock_get_stored_variation.assert_called_once_with(experiment,
175-
user_profile.UserProfile('test_user',
176-
{'111127': {'variation_id': '111128'}}))
174+
mock_get_stored_variation.assert_called_once_with(
175+
experiment, user_profile.UserProfile('test_user', {'111127': {'variation_id': '111128'}})
176+
)
177177
self.assertEqual(0, mock_audience_check.call_count)
178178
self.assertEqual(0, mock_bucket.call_count)
179179
self.assertEqual(0, mock_save.call_count)
@@ -459,7 +459,8 @@ def test_get_variation_for_rollout__skips_to_everyone_else_rule(self, mock_loggi
459459
mock.call(enums.LogLevels.DEBUG, 'User "test_user" is not in the traffic group for the targeting else. '
460460
'Checking "Everyone Else" rule now.'),
461461
mock.call(enums.LogLevels.DEBUG, 'User "test_user" meets conditions for targeting rule "Everyone Else".')],
462-
mock_logging.call_args_list)
462+
mock_logging.call_args_list
463+
)
463464

464465
def test_get_variation_for_rollout__returns_none_for_user_not_in_rollout(self, mock_logging):
465466
""" Test that get_variation_for_rollout returns None for the user not in the associated rollout. """
@@ -604,11 +605,10 @@ def test_get_variation_for_feature__returns_none_for_invalid_group_id(self, mock
604605
feature = self.project_config.get_feature_from_key('test_feature_in_group')
605606
feature.groupId = 'aabbccdd'
606607

607-
self.assertEqual(decision_service.Decision(None,
608-
None,
609-
decision_service.DECISION_SOURCE_EXPERIMENT),
610-
self.decision_service.get_variation_for_feature(feature, 'test_user')
611-
)
608+
self.assertEqual(
609+
decision_service.Decision(None, None, decision_service.DECISION_SOURCE_EXPERIMENT),
610+
self.decision_service.get_variation_for_feature(feature, 'test_user')
611+
)
612612
mock_logging.assert_called_with(enums.LogLevels.ERROR,
613613
enums.Errors.INVALID_GROUP_ID_ERROR.format('_get_variation_for_feature'))
614614

‎tests/test_event_dispatcher.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2016, Optimizely
1+
# Copyright 2016, 2018, Optimizely
22
# Licensed under the Apache License, Version 2.0 (the "License");
33
# you may not use this file except in compliance with the License.
44
# You may obtain a copy of the License at
@@ -72,7 +72,7 @@ def test_dispatch_event__handle_request_exception(self):
7272

7373
with mock.patch('requests.post',
7474
side_effect=request_exception.RequestException('Failed Request')) as mock_request_post,\
75-
mock.patch('logging.error') as mock_log_error:
75+
mock.patch('logging.error') as mock_log_error:
7676
event_dispatcher.EventDispatcher.dispatch_event(event)
7777

7878
mock_request_post.assert_called_once_with(url, data=json.dumps(params),

0 commit comments

Comments
 (0)