Skip to content

Commit c81a425

Browse files
Mat001Mat001
committed
Fixed lint errors
1 parent 340cbce commit c81a425

File tree

4 files changed

+43
-32
lines changed

4 files changed

+43
-32
lines changed

‎tests/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1058,4 +1058,4 @@ def setUp(self, config_dict='config_dict'):
10581058

10591059
config = getattr(self, config_dict)
10601060
self.optimizely = optimizely.Optimizely(json.dumps(config))
1061-
self.project_config = self.optimizely.config_manager.get_config()
1061+
self.project_config = self.optimizely.config_manager.get_config()

‎tests/test_decision_service.py

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -476,9 +476,12 @@ def test_get_variation__experiment_not_running(self):
476476
def test_get_variation__bucketing_id_provided(self):
477477
""" Test that get_variation calls bucket with correct bucketing ID if provided. """
478478

479-
user = optimizely_user_context.OptimizelyUserContext(optimizely_client=None, user_id="test_user",
480-
user_attributes={"random_key": "random_value",
481-
"$opt_bucketing_id": "user_bucket_value", })
479+
user = optimizely_user_context.OptimizelyUserContext(optimizely_client=None,
480+
user_id="test_user",
481+
user_attributes={
482+
"random_key": "random_value",
483+
"$opt_bucketing_id": "user_bucket_value",
484+
})
482485
experiment = self.project_config.get_experiment_from_key("test_experiment")
483486
with mock.patch(
484487
"optimizely.decision_service.DecisionService.get_forced_variation",
@@ -1312,8 +1315,9 @@ def test_get_variation_for_feature__returns_variation_if_user_not_in_experiment_
13121315
with mock.patch(
13131316
"optimizely.helpers.audience.does_user_meet_audience_conditions",
13141317
side_effect=[[False, []], [True, []]],
1315-
) as mock_audience_check, self.mock_decision_logger as mock_decision_service_logging, mock.patch(
1316-
"optimizely.bucketer.Bucketer.bucket", return_value=[expected_variation, []]):
1318+
) as mock_audience_check, \
1319+
self.mock_decision_logger as mock_decision_service_logging, mock.patch(
1320+
"optimizely.bucketer.Bucketer.bucket", return_value=[expected_variation, []]):
13171321
decision, _ = self.decision_service.get_variation_for_feature(
13181322
self.project_config, feature, user
13191323
)
@@ -1444,7 +1448,7 @@ def test_get_variation_for_feature__returns_variation_for_feature_in_mutex_group
14441448
"group_2_exp_1", "38901"
14451449
)
14461450
with mock.patch(
1447-
'optimizely.bucketer.Bucketer._generate_bucket_value', return_value=2400) as mock_generate_bucket_value, \
1451+
'optimizely.bucketer.Bucketer._generate_bucket_value', return_value=2400) as mock_generate_bucket_value, \
14481452
mock.patch.object(self.project_config, 'logger') as mock_config_logging:
14491453
variation_received, _ = self.decision_service.get_variation_for_feature(
14501454
self.project_config, feature, user
@@ -1477,7 +1481,7 @@ def test_get_variation_for_feature__returns_variation_for_feature_in_mutex_group
14771481
"group_2_exp_2", "38905"
14781482
)
14791483
with mock.patch(
1480-
'optimizely.bucketer.Bucketer._generate_bucket_value', return_value=4000) as mock_generate_bucket_value, \
1484+
'optimizely.bucketer.Bucketer._generate_bucket_value', return_value=4000) as mock_generate_bucket_value, \
14811485
mock.patch.object(self.project_config, 'logger') as mock_config_logging:
14821486
variation_received, _ = self.decision_service.get_variation_for_feature(
14831487
self.project_config, feature, user
@@ -1508,7 +1512,7 @@ def test_get_variation_for_feature__returns_variation_for_feature_in_mutex_group
15081512
)
15091513

15101514
with mock.patch(
1511-
'optimizely.bucketer.Bucketer._generate_bucket_value', return_value=6500) as mock_generate_bucket_value, \
1515+
'optimizely.bucketer.Bucketer._generate_bucket_value', return_value=6500) as mock_generate_bucket_value, \
15121516
mock.patch.object(self.project_config, 'logger') as mock_config_logging:
15131517
variation_received, _ = self.decision_service.get_variation_for_feature(
15141518
self.project_config, feature, user
@@ -1534,7 +1538,7 @@ def test_get_variation_for_feature__returns_variation_for_rollout_in_mutex_group
15341538
feature = self.project_config.get_feature_from_key("test_feature_in_exclusion_group")
15351539

15361540
with mock.patch(
1537-
'optimizely.bucketer.Bucketer._generate_bucket_value', return_value=8000) as mock_generate_bucket_value, \
1541+
'optimizely.bucketer.Bucketer._generate_bucket_value', return_value=8000) as mock_generate_bucket_value, \
15381542
mock.patch.object(self.project_config, 'logger') as mock_config_logging:
15391543
variation_received, _ = self.decision_service.get_variation_for_feature(
15401544
self.project_config, feature, user
@@ -1567,7 +1571,7 @@ def test_get_variation_for_feature__returns_variation_for_feature_in_experiment_
15671571
)
15681572

15691573
with mock.patch(
1570-
'optimizely.bucketer.Bucketer._generate_bucket_value', return_value=2400) as mock_generate_bucket_value, \
1574+
'optimizely.bucketer.Bucketer._generate_bucket_value', return_value=2400) as mock_generate_bucket_value, \
15711575
mock.patch.object(self.project_config, 'logger') as mock_config_logging:
15721576
variation_received, _ = self.decision_service.get_variation_for_feature(
15731577
self.project_config, feature, user
@@ -1597,7 +1601,7 @@ def test_get_variation_for_feature__returns_variation_for_feature_in_experiment_
15971601
"test_experiment4", "222240"
15981602
)
15991603
with mock.patch(
1600-
'optimizely.bucketer.Bucketer._generate_bucket_value', return_value=4000) as mock_generate_bucket_value, \
1604+
'optimizely.bucketer.Bucketer._generate_bucket_value', return_value=4000) as mock_generate_bucket_value, \
16011605
mock.patch.object(self.project_config, 'logger') as mock_config_logging:
16021606
variation_received, _ = self.decision_service.get_variation_for_feature(
16031607
self.project_config, feature, user
@@ -1628,7 +1632,7 @@ def test_get_variation_for_feature__returns_variation_for_feature_in_experiment_
16281632
)
16291633

16301634
with mock.patch(
1631-
'optimizely.bucketer.Bucketer._generate_bucket_value', return_value=6500) as mock_generate_bucket_value, \
1635+
'optimizely.bucketer.Bucketer._generate_bucket_value', return_value=6500) as mock_generate_bucket_value, \
16321636
mock.patch.object(self.project_config, 'logger') as mock_config_logging:
16331637
variation_received, _ = self.decision_service.get_variation_for_feature(
16341638
self.project_config, feature, user
@@ -1654,7 +1658,7 @@ def test_get_variation_for_feature__returns_variation_for_rollout_in_experiment_
16541658
feature = self.project_config.get_feature_from_key("test_feature_in_multiple_experiments")
16551659

16561660
with mock.patch(
1657-
'optimizely.bucketer.Bucketer._generate_bucket_value', return_value=8000) as mock_generate_bucket_value, \
1661+
'optimizely.bucketer.Bucketer._generate_bucket_value', return_value=8000) as mock_generate_bucket_value, \
16581662
mock.patch.object(self.project_config, 'logger') as mock_config_logging:
16591663
variation_received, _ = self.decision_service.get_variation_for_feature(
16601664
self.project_config, feature, user
@@ -1686,7 +1690,7 @@ def test_get_variation_for_feature__returns_variation_for_rollout_in_mutex_group
16861690
"211147", "211149"
16871691
)
16881692
with mock.patch(
1689-
'optimizely.bucketer.Bucketer._generate_bucket_value', return_value=2400) as mock_generate_bucket_value, \
1693+
'optimizely.bucketer.Bucketer._generate_bucket_value', return_value=2400) as mock_generate_bucket_value, \
16901694
mock.patch.object(self.project_config, 'logger') as mock_config_logging:
16911695
variation_received, _ = self.decision_service.get_variation_for_feature(
16921696
self.project_config, feature, user
@@ -1720,7 +1724,7 @@ def test_get_variation_for_feature_returns_rollout_in_experiment_bucket_range_25
17201724
)
17211725

17221726
with mock.patch(
1723-
'optimizely.bucketer.Bucketer._generate_bucket_value', return_value=4000) as mock_generate_bucket_value, \
1727+
'optimizely.bucketer.Bucketer._generate_bucket_value', return_value=4000) as mock_generate_bucket_value, \
17241728
mock.patch.object(self.project_config, 'logger') as mock_config_logging:
17251729
variation_received, _ = self.decision_service.get_variation_for_feature(
17261730
self.project_config, feature, user

‎tests/test_optimizely.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -648,10 +648,9 @@ def on_activate(experiment, user_id, attributes, variation, event):
648648
mock_variation = project_config.get_variation_from_id('test_experiment', '111129')
649649

650650
with mock.patch(
651-
'optimizely.decision_service.DecisionService.get_variation_for_feature',
651+
'optimizely.decision_service.DecisionService.get_variation_for_feature',
652652
return_value=(
653-
decision_service.Decision(mock_experiment, mock_variation, enums.DecisionSources.FEATURE_TEST),
654-
[]),
653+
decision_service.Decision(mock_experiment, mock_variation, enums.DecisionSources.FEATURE_TEST), []),
655654
) as mock_decision, mock.patch('optimizely.event.event_processor.ForwardingEventProcessor.process'):
656655
self.assertTrue(opt_obj.is_feature_enabled('test_feature_in_experiment', 'test_user'))
657656

@@ -677,7 +676,7 @@ def on_activate(experiment, user_id, attributes, variation, event):
677676
mock_experiment = project_config.get_experiment_from_key('test_experiment')
678677
mock_variation = project_config.get_variation_from_id('test_experiment', '111129')
679678
with mock.patch(
680-
'optimizely.decision_service.DecisionService.get_variation_for_feature',
679+
'optimizely.decision_service.DecisionService.get_variation_for_feature',
681680
return_value=(decision_service.Decision(mock_experiment,
682681
mock_variation, enums.DecisionSources.ROLLOUT), []),
683682
) as mock_decision, mock.patch(
@@ -697,7 +696,7 @@ def test_activate__with_attributes__audience_match(self):
697696
variation when attributes are provided and audience conditions are met. """
698697

699698
with mock.patch(
700-
'optimizely.decision_service.DecisionService.get_variation',
699+
'optimizely.decision_service.DecisionService.get_variation',
701700
return_value=(self.project_config.get_variation_from_id('test_experiment', '111129'), []),
702701
) as mock_get_variation, mock.patch('time.time', return_value=42), mock.patch(
703702
'uuid.uuid4', return_value='a68cf1ad-0393-4e18-af87-efe8f01a7c9c'
@@ -768,7 +767,7 @@ def test_activate__with_attributes_of_different_types(self):
768767
variation when different types of attributes are provided and audience conditions are met. """
769768

770769
with mock.patch(
771-
'optimizely.bucketer.Bucketer.bucket',
770+
'optimizely.bucketer.Bucketer.bucket',
772771
return_value=(self.project_config.get_variation_from_id('test_experiment', '111129'), []),
773772
) as mock_bucket, mock.patch('time.time', return_value=42), mock.patch(
774773
'uuid.uuid4', return_value='a68cf1ad-0393-4e18-af87-efe8f01a7c9c'
@@ -1040,7 +1039,7 @@ def test_activate__with_attributes__audience_match__bucketing_id_provided(self):
10401039
when attributes (including bucketing ID) are provided and audience conditions are met. """
10411040

10421041
with mock.patch(
1043-
'optimizely.decision_service.DecisionService.get_variation',
1042+
'optimizely.decision_service.DecisionService.get_variation',
10441043
return_value=(self.project_config.get_variation_from_id('test_experiment', '111129'), []),
10451044
) as mock_get_variation, mock.patch('time.time', return_value=42), mock.patch(
10461045
'uuid.uuid4', return_value='a68cf1ad-0393-4e18-af87-efe8f01a7c9c'
@@ -1187,7 +1186,7 @@ def test_activate__bucketer_returns_none(self):
11871186
""" Test that activate returns None and does not process event when user is in no variation. """
11881187

11891188
with mock.patch(
1190-
'optimizely.helpers.audience.does_user_meet_audience_conditions',
1189+
'optimizely.helpers.audience.does_user_meet_audience_conditions',
11911190
return_value=(True, [])), mock.patch(
11921191
'optimizely.bucketer.Bucketer.bucket',
11931192
return_value=(None, [])) as mock_bucket, mock.patch(

‎tests/test_user_context.py

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,14 +1150,18 @@ def test_decide_reasons__hit_everyone_else_rule__fails_bucketing(self):
11501150
actual = user_context.decide('test_feature_in_rollout', ['INCLUDE_REASONS'])
11511151

11521152
expected_reasons = [
1153-
'Invalid variation is mapped to flag (test_feature_in_rollout) and user (test_user) in the forced decision map.',
1154-
'Invalid variation is mapped to flag (test_feature_in_rollout), rule (211127) and user (test_user) in the forced decision map.',
1153+
'Invalid variation is mapped to flag (test_feature_in_rollout) and user (test_user) '
1154+
'in the forced decision map.',
1155+
'Invalid variation is mapped to flag (test_feature_in_rollout), rule (211127) and user (test_user) '
1156+
'in the forced decision map.',
11551157
'Evaluating audiences for rule 1: ["11154"].', 'Audiences for rule 1 collectively evaluated to FALSE.',
11561158
'User "test_user" does not meet audience conditions for targeting rule 1.',
1157-
'Invalid variation is mapped to flag (test_feature_in_rollout), rule (211137) and user (test_user) in the forced decision map.',
1159+
'Invalid variation is mapped to flag (test_feature_in_rollout), rule (211137) and user (test_user) '
1160+
'in the forced decision map.',
11581161
'Evaluating audiences for rule 2: ["11159"].', 'Audiences for rule 2 collectively evaluated to FALSE.',
11591162
'User "test_user" does not meet audience conditions for targeting rule 2.',
1160-
'Invalid variation is mapped to flag (test_feature_in_rollout), rule (211147) and user (test_user) in the forced decision map.',
1163+
'Invalid variation is mapped to flag (test_feature_in_rollout), rule (211147) and user (test_user) '
1164+
'in the forced decision map.',
11611165
'Evaluating audiences for rule Everyone Else: [].',
11621166
'Audiences for rule Everyone Else collectively evaluated to TRUE.',
11631167
'User "test_user" meets audience conditions for targeting rule Everyone Else.',
@@ -1174,16 +1178,20 @@ def test_decide_reasons__hit_everyone_else_rule(self):
11741178
actual = user_context.decide('test_feature_in_rollout', ['INCLUDE_REASONS'])
11751179

11761180
expected_reasons = [
1177-
'Invalid variation is mapped to flag (test_feature_in_rollout) and user (abcde) in the forced decision map.',
1178-
'Invalid variation is mapped to flag (test_feature_in_rollout), rule (211127) and user (abcde) in the forced decision map.',
1181+
'Invalid variation is mapped to flag (test_feature_in_rollout) and user (abcde) '
1182+
'in the forced decision map.',
1183+
'Invalid variation is mapped to flag (test_feature_in_rollout), rule (211127) and user (abcde) '
1184+
'in the forced decision map.',
11791185
'Evaluating audiences for rule 1: ["11154"].',
11801186
'Audiences for rule 1 collectively evaluated to FALSE.',
11811187
'User "abcde" does not meet audience conditions for targeting rule 1.',
1182-
'Invalid variation is mapped to flag (test_feature_in_rollout), rule (211137) and user (abcde) in the forced decision map.',
1188+
'Invalid variation is mapped to flag (test_feature_in_rollout), rule (211137) and user (abcde) '
1189+
'in the forced decision map.',
11831190
'Evaluating audiences for rule 2: ["11159"].',
11841191
'Audiences for rule 2 collectively evaluated to FALSE.',
11851192
'User "abcde" does not meet audience conditions for targeting rule 2.',
1186-
'Invalid variation is mapped to flag (test_feature_in_rollout), rule (211147) and user (abcde) in the forced decision map.',
1193+
'Invalid variation is mapped to flag (test_feature_in_rollout), rule (211147) and user (abcde) '
1194+
'in the forced decision map.',
11871195
'Evaluating audiences for rule Everyone Else: [].',
11881196
'Audiences for rule Everyone Else collectively evaluated to TRUE.',
11891197
'User "abcde" meets audience conditions for targeting rule Everyone Else.',

0 commit comments

Comments
 (0)