Merge pull request #175 from launchdarkly/cc/sc-130602/test-data-flag-rule-builder-op-bugfix

Bugfix for FlagRuleBuilder evaluation internals

Author: charukiewicz

ldclient/impl/integrations/test_data/test_data_source.py

@@ -5,11 +5,13 @@
 
 class _TestDataSource():
 
-    def __init__(self, feature_store, test_data):
+    def __init__(self, feature_store, test_data, ready):
         self._feature_store = feature_store
         self._test_data = test_data
+        self._ready = ready
 
     def start(self):
+        self._ready.set()
         self._feature_store.init(self._test_data._make_init_data())
 
     def stop(self):

ldclient/integrations/test_data.py

@@ -51,7 +51,7 @@ def __init__(self):
         self._instances = []
 
     def __call__(self, config, store, ready):
-        data_source = _TestDataSource(store, self)
+        data_source = _TestDataSource(store, self, ready)
         try:
             self._lock.lock()
             self._instances.append(data_source)
@@ -485,7 +485,7 @@ def and_match(self, attribute: str, *values) -> 'FlagRuleBuilder':
         """
         self._clauses.append({
                 'attribute': attribute,
-                'operator': 'in',
+                'op': 'in',
                 'values': list(values),
                 'negate': False
             })
@@ -508,7 +508,7 @@ def and_not_match(self, attribute: str, *values) -> 'FlagRuleBuilder':
         """
         self._clauses.append({
                 'attribute': attribute,
-                'operator': 'in',
+                'op': 'in',
                 'values': list(values),
                 'negate': True
             })

testing/integrations/test_test_data_source.py

@@ -285,7 +285,7 @@ def test_flagbuilder_can_build():
                 'clauses': [
                     {'attribute': 'country',
                     'negate': False,
-                    'operator': 'in',
+                    'op': 'in',
                     'values': ['fr']
                     }
                 ],
@@ -297,3 +297,35 @@ def test_flagbuilder_can_build():
     }
 
     assert flag._build(1) == expected_result
+
+def test_flag_can_evaluate_rules():
+    td = TestData.data_source()
+    store = InMemoryFeatureStore()
+
+    client = LDClient(config=Config('SDK_KEY',
+                      update_processor_class = td,
+                      send_events = False,
+                      feature_store = store))
+
+    td.update(td.flag(key='test-flag')
+                .fallthrough_variation(False)
+                .if_match('firstName', 'Mike')
+                .and_not_match('country', 'gb')
+                .then_return(True))
+
+    # user1 should satisfy the rule (matching firstname, not matching country)
+    user1 = { 'key': 'user1', 'firstName': 'Mike', 'country': 'us' }
+    eval1 = client.variation_detail('test-flag', user1, default='default')
+
+    assert eval1.value == True
+    assert eval1.variation_index == 0
+    assert eval1.reason['kind'] == 'RULE_MATCH'
+
+    # user2 should NOT satisfy the rule (not matching firstname despite not matching country)
+    user2 = { 'key': 'user2', 'firstName': 'Joe', 'country': 'us' }
+    eval2 = client.variation_detail('test-flag', user2, default='default')
+
+    assert eval2.value == False
+    assert eval2.variation_index == 1
+    assert eval2.reason['kind'] == 'FALLTHROUGH'
+