polishing

Author: chillaq

splitio/sync/segment.py

@@ -254,7 +254,7 @@ def synchronize_segment(self, segment_name, till=None):
         """
         try:
             fetched = self._read_segment_from_json_file(segment_name)
-            if fetched == {}:
+            if fetched is None:
                 return False
             fetched_sha = util._get_sha(json.dumps(fetched))
             if not self.segment_exist_in_storage(segment_name):
@@ -308,10 +308,10 @@ def _sanitize_segment(self, parsed):
         """
         if 'name' not in parsed or parsed['name'] is None:
             _LOGGER.warning("Segment does not have [name] element, skipping")
-            return {}
+            return None
         if parsed['name'].strip() == '':
             _LOGGER.warning("Segment [name] element is blank, skipping")
-            return {}
+            return None
 
         for element in [('till', -1, -1, None, None, [0]),
                         ('added', [], None, None, None, None),

tests/client/test_input_validator.py

@@ -32,7 +32,6 @@ def test_get_treatment(self, mocker):
         impmanager = mocker.Mock(spec=ImpressionManager)
         telemetry_storage = InMemoryTelemetryStorage()
         telemetry_producer = TelemetryStorageProducer(telemetry_storage)
-        telemetry_consumer = TelemetryStorageConsumer(telemetry_storage)
         recorder = StandardRecorder(impmanager, mocker.Mock(spec=EventStorage), ImpressionStorage, telemetry_producer.get_telemetry_evaluation_producer())
         factory = SplitFactory(mocker.Mock(),
             {
@@ -46,7 +45,7 @@ def test_get_treatment(self, mocker):
             impmanager,
             mocker.Mock(),
             telemetry_producer,
-            telemetry_consumer.get_telemetry_init_consumer(),
+            telemetry_producer.get_telemetry_init_producer(),
             mocker.Mock()
         )
 
@@ -267,7 +266,6 @@ def _configs(treatment):
         impmanager = mocker.Mock(spec=ImpressionManager)
         telemetry_storage = InMemoryTelemetryStorage()
         telemetry_producer = TelemetryStorageProducer(telemetry_storage)
-        telemetry_consumer = TelemetryStorageConsumer(telemetry_storage)
         recorder = StandardRecorder(impmanager, mocker.Mock(spec=EventStorage), ImpressionStorage, telemetry_producer.get_telemetry_evaluation_producer())
         factory = SplitFactory(mocker.Mock(),
             {
@@ -281,7 +279,7 @@ def _configs(treatment):
             impmanager,
             mocker.Mock(),
             telemetry_producer,
-            telemetry_consumer.get_telemetry_init_consumer(),
+            telemetry_producer.get_telemetry_init_producer(),
             mocker.Mock()
         )
 
@@ -539,7 +537,6 @@ def test_track(self, mocker):
         impmanager = mocker.Mock(spec=ImpressionManager)
         telemetry_storage = InMemoryTelemetryStorage()
         telemetry_producer = TelemetryStorageProducer(telemetry_storage)
-        telemetry_consumer = TelemetryStorageConsumer(telemetry_storage)
         recorder = StandardRecorder(impmanager, events_storage_mock, ImpressionStorage, telemetry_producer.get_telemetry_evaluation_producer())
         factory = SplitFactory(mocker.Mock(),
             {
@@ -814,7 +811,6 @@ def test_get_treatments(self, mocker):
         impmanager = mocker.Mock(spec=ImpressionManager)
         telemetry_storage = InMemoryTelemetryStorage()
         telemetry_producer = TelemetryStorageProducer(telemetry_storage)
-        telemetry_consumer = TelemetryStorageConsumer(telemetry_storage)
         recorder = StandardRecorder(impmanager, mocker.Mock(spec=EventStorage), mocker.Mock(spec=ImpressionStorage), telemetry_producer.get_telemetry_evaluation_producer())
         factory = SplitFactory(mocker.Mock(),
             {
@@ -955,7 +951,6 @@ def test_get_treatments_with_config(self, mocker):
         impmanager = mocker.Mock(spec=ImpressionManager)
         telemetry_storage = InMemoryTelemetryStorage()
         telemetry_producer = TelemetryStorageProducer(telemetry_storage)
-        telemetry_consumer = TelemetryStorageConsumer(telemetry_storage)
         recorder = StandardRecorder(impmanager, mocker.Mock(spec=EventStorage), mocker.Mock(spec=ImpressionStorage), telemetry_producer.get_telemetry_evaluation_producer())
         factory = SplitFactory(mocker.Mock(),
             {
@@ -1091,7 +1086,6 @@ def test_split_(self, mocker):
         impmanager = mocker.Mock(spec=ImpressionManager)
         telemetry_storage = InMemoryTelemetryStorage()
         telemetry_producer = TelemetryStorageProducer(telemetry_storage)
-        telemetry_consumer = TelemetryStorageConsumer(telemetry_storage)
         recorder = StandardRecorder(impmanager, mocker.Mock(spec=EventStorage), mocker.Mock(spec=ImpressionStorage), telemetry_producer.get_telemetry_evaluation_producer())
         factory = SplitFactory(mocker.Mock(),
             {

tests/sync/test_segments_synchronizer.py

@@ -305,11 +305,11 @@ def test_json_elements_sanitization(self, mocker):
 
         # should reject segment if 'name' is null
         segment2 = {"name": None, "added": [], "removed": [], "since": -1, "till": 12}
-        assert(segment_synchronizer._sanitize_segment(segment2) == {})
+        assert(segment_synchronizer._sanitize_segment(segment2) == None)
 
         # should reject segment if 'name' does not exist
         segment2 = {"added": [], "removed": [], "since": -1, "till": 12}
-        assert(segment_synchronizer._sanitize_segment(segment2) == {})
+        assert(segment_synchronizer._sanitize_segment(segment2) == None)
 
         # should add missing 'added' element
         segment2 = {"name": 'seg', "removed": [], "since": -1, "till": 12}