Merge pull request splitio#53 from splitio/fixAlgoDefault

Fix algo default

Author: sarrubia

splitio/splits.py

@@ -64,7 +64,10 @@ def __init__(self, name, seed, killed, default_treatment, traffic_type_name,
         self._status = status
         self._change_number = change_number
         self._conditions = conditions if conditions is not None else []
-        self._algo = HashAlgorithm(algo) if algo else HashAlgorithm.LEGACY
+        try:
+            self._algo = HashAlgorithm(algo)
+        except ValueError:
+            self._algo = HashAlgorithm.LEGACY
 
     @property
     def name(self):

splitio/tests/algoSplits.json

@@ -196,6 +196,67 @@
                     ]
                 }
             ]
+        },
+        {
+            "orgId": null,
+            "environment": null,
+            "trafficTypeId": null,
+            "trafficTypeName": null,
+            "name": "some_feature_5",
+            "algo": 38,
+            "seed": 1548363147,
+            "changeNumber":1325599980,
+            "status": "ACTIVE",
+            "killed": false,
+            "defaultTreatment": "off",
+            "conditions": [
+                {
+                    "matcherGroup": {
+                        "combiner": "AND",
+                        "matchers": [
+                            {
+                                "matcherType": "IN_SEGMENT",
+                                "negate": false,
+                                "userDefinedSegmentMatcherData": {
+                                    "segmentName": "employees"
+                                },
+                                "whitelistMatcherData": null
+                            }
+                        ]
+                    },
+                    "partitions": [
+                        {
+                            "treatment": "on",
+                            "size": 100
+                        }
+                    ]
+                },
+                {
+                    "matcherGroup": {
+                        "combiner": "AND",
+                        "matchers": [
+                            {
+                                "matcherType": "IN_SEGMENT",
+                                "negate": false,
+                                "userDefinedSegmentMatcherData": {
+                                    "segmentName": "human_beigns"
+                                },
+                                "whitelistMatcherData": null
+                            }
+                        ]
+                    },
+                    "partitions": [
+                        {
+                            "treatment": "on",
+                            "size": 30
+                        },
+                        {
+                            "treatment": "off",
+                            "size": 70
+                        }
+                    ]
+                }
+            ]
         }
     ],
     "since": -1,

splitio/tests/test_splits.py

@@ -12,14 +12,13 @@
 import json
 from splitio.splits import (InMemorySplitFetcher, SelfRefreshingSplitFetcher, SplitChangeFetcher,
                             ApiSplitChangeFetcher, SplitParser, AllKeysSplit,
-                            CacheBasedSplitFetcher)
+                            CacheBasedSplitFetcher, HashAlgorithm)
 from splitio.matchers import (AndCombiner, AllKeysMatcher, UserDefinedSegmentMatcher,
                               WhitelistMatcher, AttributeMatcher)
 from splitio.tests.utils import MockUtilsMixin
 from os.path import join, dirname
 from splitio.hashfns import _murmur_hash, get_hash_fn
 from splitio.hashfns.legacy import legacy_hash
-from splitio.splits import HashAlgorithm
 from splitio.redis_support import get_redis, RedisSegmentCache, RedisSplitParser
 from splitio.uwsgi import get_uwsgi, UWSGISegmentCache, UWSGISplitParser
 
@@ -932,6 +931,11 @@ def setUp(self):
             'body': rawData[3],
             'algo': HashAlgorithm.LEGACY,
             'hashfn': legacy_hash
+        },
+        {
+            'body': rawData[4],
+            'algo': HashAlgorithm.LEGACY,
+            'hashfn': legacy_hash
         }]
 
     def testAlgoHandlers(self):
@@ -941,7 +945,6 @@ def testAlgoHandlers(self):
         segment_cache = RedisSegmentCache(redis)
         split_parser = RedisSplitParser(segment_cache)
         for sp in self._testData:
-            print(sp)
             split = split_parser.parse(sp['body'], True)
             self.assertEqual(split.algo, sp['algo'])
             self.assertEqual(get_hash_fn(split.algo), sp['hashfn'])
@@ -973,6 +976,11 @@ def setUp(self):
             'body': rawData[3],
             'algo': HashAlgorithm.LEGACY,
             'hashfn': legacy_hash
+        },
+        {
+            'body': rawData[4],
+            'algo': HashAlgorithm.LEGACY,
+            'hashfn': legacy_hash
         }]
 
     def testAlgoHandlers(self):