@@ -377,7 +377,7 @@ def test_get_variation_for_rollout__returns_none_if_no_experiments(self, mock_lo
377
377
""" Test that get_variation_for_rollout returns None if there are no experiments (targeting rules). """
378
378
379
379
no_experiment_rollout = self .project_config .get_rollout_from_id ('201111' )
380
- self .assertEqual (decision_service .Decision (None , None , decision_service . DECISION_SOURCE_ROLLOUT ),
380
+ self .assertEqual (decision_service .Decision (None , None ),
381
381
self .decision_service .get_variation_for_rollout (no_experiment_rollout , 'test_user' ))
382
382
383
383
# Assert no log messages were generated
@@ -393,8 +393,7 @@ def test_get_variation_for_rollout__returns_decision_if_user_in_rollout(self, mo
393
393
mock .patch ('optimizely.bucketer.Bucketer.bucket' ,
394
394
return_value = self .project_config .get_variation_from_id ('211127' , '211129' )) as mock_bucket :
395
395
self .assertEqual (decision_service .Decision (self .project_config .get_experiment_from_id ('211127' ),
396
- self .project_config .get_variation_from_id ('211127' , '211129' ),
397
- decision_service .DECISION_SOURCE_ROLLOUT ),
396
+ self .project_config .get_variation_from_id ('211127' , '211129' )),
398
397
self .decision_service .get_variation_for_rollout (rollout , 'test_user' ))
399
398
400
399
# Check all log messages
@@ -415,8 +414,7 @@ def test_get_variation_for_rollout__calls_bucket_with_bucketing_id(self, mock_lo
415
414
mock .patch ('optimizely.bucketer.Bucketer.bucket' ,
416
415
return_value = self .project_config .get_variation_from_id ('211127' , '211129' )) as mock_bucket :
417
416
self .assertEqual (decision_service .Decision (self .project_config .get_experiment_from_id ('211127' ),
418
- self .project_config .get_variation_from_id ('211127' , '211129' ),
419
- decision_service .DECISION_SOURCE_ROLLOUT ),
417
+ self .project_config .get_variation_from_id ('211127' , '211129' )),
420
418
self .decision_service .get_variation_for_rollout (rollout ,
421
419
'test_user' ,
422
420
{'$opt_bucketing_id' : 'user_bucket_value' }))
@@ -440,7 +438,7 @@ def test_get_variation_for_rollout__skips_to_everyone_else_rule(self, mock_loggi
440
438
441
439
with mock .patch ('optimizely.helpers.audience.is_user_in_experiment' , return_value = True ) as mock_audience_check ,\
442
440
mock .patch ('optimizely.bucketer.Bucketer.bucket' , return_value = None ):
443
- self .assertEqual (decision_service .Decision (None , None , decision_service . DECISION_SOURCE_ROLLOUT ),
441
+ self .assertEqual (decision_service .Decision (None , None ),
444
442
self .decision_service .get_variation_for_rollout (rollout , 'test_user' ))
445
443
446
444
# Check that after first experiment, it skips to the last experiment to check
@@ -463,7 +461,7 @@ def test_get_variation_for_rollout__returns_none_for_user_not_in_rollout(self, m
463
461
rollout = self .project_config .get_rollout_from_id ('211111' )
464
462
465
463
with mock .patch ('optimizely.helpers.audience.is_user_in_experiment' , return_value = False ) as mock_audience_check :
466
- self .assertEqual (decision_service .Decision (None , None , decision_service . DECISION_SOURCE_ROLLOUT ),
464
+ self .assertEqual (decision_service .Decision (None , None ),
467
465
self .decision_service .get_variation_for_rollout (rollout , 'test_user' ))
468
466
469
467
# Check that all experiments in rollout layer were checked
@@ -489,10 +487,8 @@ def test_get_variation_for_feature__returns_variation_for_feature_in_experiment(
489
487
expected_variation = self .project_config .get_variation_from_id ('test_experiment' , '111129' )
490
488
with mock .patch ('optimizely.decision_service.DecisionService.get_variation' ,
491
489
return_value = expected_variation ) as mock_decision :
492
- self .assertEqual (decision_service .Decision (expected_experiment ,
493
- expected_variation ,
494
- decision_service .DECISION_SOURCE_EXPERIMENT ),
495
- self .decision_service .get_variation_for_feature (feature , 'test_user' ))
490
+ self .assertEqual (decision_service .Decision (expected_experiment , expected_variation ),
491
+ self .decision_service .get_variation_for_feature (feature , 'user1' ))
496
492
497
493
mock_decision .assert_called_once_with (
498
494
self .project_config .get_experiment_from_key ('test_experiment' ), 'test_user' , None
@@ -531,10 +527,8 @@ def test_get_variation_for_feature__returns_variation_if_user_not_in_experiment_
531
527
'optimizely.helpers.audience.is_user_in_experiment' ,
532
528
side_effect = [False , True ]) as mock_audience_check , \
533
529
mock .patch ('optimizely.bucketer.Bucketer.bucket' , return_value = expected_variation ):
534
- self .assertEqual (decision_service .Decision (expected_experiment ,
535
- expected_variation ,
536
- decision_service .DECISION_SOURCE_ROLLOUT ),
537
- self .decision_service .get_variation_for_feature (feature , 'test_user' ))
530
+ self .assertEqual (decision_service .Decision (expected_experiment , expected_variation ),
531
+ self .decision_service .get_variation_for_feature (feature , 'user1' ))
538
532
539
533
self .assertEqual (2 , mock_audience_check .call_count )
540
534
mock_audience_check .assert_any_call (self .project_config ,
@@ -555,10 +549,8 @@ def test_get_variation_for_feature__returns_variation_for_feature_in_group(self,
555
549
return_value = self .project_config .get_experiment_from_key ('group_exp_1' )) as mock_get_experiment_in_group , \
556
550
mock .patch ('optimizely.decision_service.DecisionService.get_variation' ,
557
551
return_value = expected_variation ) as mock_decision :
558
- self .assertEqual (decision_service .Decision (expected_experiment ,
559
- expected_variation ,
560
- decision_service .DECISION_SOURCE_EXPERIMENT ),
561
- self .decision_service .get_variation_for_feature (feature , 'test_user' ))
552
+ self .assertEqual (decision_service .Decision (expected_experiment , expected_variation ),
553
+ self .decision_service .get_variation_for_feature (feature , 'user1' ))
562
554
563
555
mock_get_experiment_in_group .assert_called_once_with (self .project_config .get_group ('19228' ), 'test_user' )
564
556
mock_decision .assert_called_once_with (self .project_config .get_experiment_from_key ('group_exp_1' ), 'test_user' , None )
@@ -572,8 +564,8 @@ def test_get_variation_for_feature__returns_none_for_user_not_in_group(self, _):
572
564
with mock .patch ('optimizely.decision_service.DecisionService.get_experiment_in_group' ,
573
565
return_value = None ) as mock_get_experiment_in_group , \
574
566
mock .patch ('optimizely.decision_service.DecisionService.get_variation' ) as mock_decision :
575
- self .assertEqual (decision_service .Decision (None , None , decision_service . DECISION_SOURCE_EXPERIMENT ),
576
- self .decision_service .get_variation_for_feature (feature , 'test_user ' ))
567
+ self .assertEqual (decision_service .Decision (None , None ),
568
+ self .decision_service .get_variation_for_feature (feature , 'user1 ' ))
577
569
578
570
mock_get_experiment_in_group .assert_called_once_with (self .project_config .get_group ('19228' ), 'test_user' )
579
571
self .assertFalse (mock_decision .called )
@@ -585,10 +577,8 @@ def test_get_variation_for_feature__returns_none_for_user_not_in_experiment(self
585
577
expected_experiment = self .project_config .get_experiment_from_key ('test_experiment' )
586
578
587
579
with mock .patch ('optimizely.decision_service.DecisionService.get_variation' , return_value = None ) as mock_decision :
588
- self .assertEqual (decision_service .Decision (expected_experiment ,
589
- None ,
590
- decision_service .DECISION_SOURCE_EXPERIMENT ),
591
- self .decision_service .get_variation_for_feature (feature , 'test_user' ))
580
+ self .assertEqual (decision_service .Decision (expected_experiment , None ),
581
+ self .decision_service .get_variation_for_feature (feature , 'user1' ))
592
582
593
583
mock_decision .assert_called_once_with (
594
584
self .project_config .get_experiment_from_key ('test_experiment' ), 'test_user' , None
@@ -603,10 +593,8 @@ def test_get_variation_for_feature__returns_none_for_user_in_group_experiment_no
603
593
604
594
with mock .patch ('optimizely.decision_service.DecisionService.get_experiment_in_group' ,
605
595
return_value = self .project_config .get_experiment_from_key ('group_exp_2' )) as mock_decision :
606
- self .assertEqual (decision_service .Decision (expected_experiment ,
607
- None ,
608
- decision_service .DECISION_SOURCE_EXPERIMENT ),
609
- self .decision_service .get_variation_for_feature (feature , 'test_user' ))
596
+ self .assertEqual (decision_service .Decision (expected_experiment , None ),
597
+ self .decision_service .get_variation_for_feature (feature , 'user_1' ))
610
598
611
599
mock_decision .assert_called_once_with (self .project_config .get_group ('19228' ), 'test_user' )
612
600
0 commit comments