Merge branch 'master' into arizvi/enforce_style

optimizely · Jun 13, 2017 · d197772 · d197772
2 parents 90f8d81 + 8204f92
commit d197772
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/optimizely/user_profile.py b/optimizely/user_profile.py
@@ -48,7 +48,7 @@ def save_variation_for_experiment(self, experiment_id, variation_id):
 
     Args:
       experiment_id: ID for experiment for which the decision is to be stored.
-       variation_id: ID for variation that the user saw.
+      variation_id: ID for variation that the user saw.
     """
 
     self.experiment_bucket_map.update({

diff --git a/tests/test_optimizely.py b/tests/test_optimizely.py
@@ -596,9 +596,10 @@ def side_effect(*args, **kwargs):
     with mock.patch(
       'optimizely.optimizely.Optimizely.is_feature_enabled',
       side_effect=side_effect) as mock_is_feature_enabled:
-      expected_enabled_features = ['test_feature_1', 'test_feature_2']
-      self.assertEqual(expected_enabled_features, optimizely_instance.get_enabled_features('user_1'))
+      received_features = optimizely_instance.get_enabled_features('user_1')
 
+    expected_enabled_features = ['test_feature_1', 'test_feature_2']
+    self.assertEqual(sorted(expected_enabled_features), sorted(received_features))
     mock_is_feature_enabled.assert_any_call('test_feature_1', 'user_1', None)
     mock_is_feature_enabled.assert_any_call('test_feature_2', 'user_1', None)
     mock_is_feature_enabled.assert_any_call('test_feature_in_group', 'user_1', None)