Skip to content

Commit 6f977b2

Browse files
committed
polising
1 parent 60c5541 commit 6f977b2

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

CHANGES.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
9.4.0 (Feb 21, 2023)
1+
9.4.0 (Mar 1, 2023)
22
- Added support to use JSON files in localhost mode.
33
- Updated default periodic telemetry post time to one hour.
44
- Fixed unhandeled exception in push.manager.py class when SDK is connected to split proxy

splitio/sync/segment.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,6 @@ def synchronize_segment(self, segment_name, till=None):
255255
"""
256256
try:
257257
fetched = self._read_segment_from_json_file(segment_name)
258-
if fetched is None:
259-
return False
260258
fetched_sha = util._get_sha(json.dumps(fetched))
261259
if not self.segment_exist_in_storage(segment_name):
262260
self._segment_sha[segment_name] = fetched_sha
@@ -309,10 +307,10 @@ def _sanitize_segment(self, parsed):
309307
"""
310308
if 'name' not in parsed or parsed['name'] is None:
311309
_LOGGER.warning("Segment does not have [name] element, skipping")
312-
return None
310+
raise Exception("Segment does not have [name] element")
313311
if parsed['name'].strip() == '':
314312
_LOGGER.warning("Segment [name] element is blank, skipping")
315-
return None
313+
raise Exception("Segment [name] element is blank")
316314

317315
for element in [('till', -1, -1, None, None, [0]),
318316
('added', [], None, None, None, None),

tests/sync/test_segments_synchronizer.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,11 +305,21 @@ def test_json_elements_sanitization(self, mocker):
305305

306306
# should reject segment if 'name' is null
307307
segment2 = {"name": None, "added": [], "removed": [], "since": -1, "till": 12}
308-
assert(segment_synchronizer._sanitize_segment(segment2) == None)
308+
exception_called = False
309+
try:
310+
segment_synchronizer._sanitize_segment(segment2)
311+
except:
312+
exception_called = True
313+
assert(exception_called)
309314

310315
# should reject segment if 'name' does not exist
311316
segment2 = {"added": [], "removed": [], "since": -1, "till": 12}
312-
assert(segment_synchronizer._sanitize_segment(segment2) == None)
317+
exception_called = False
318+
try:
319+
segment_synchronizer._sanitize_segment(segment2)
320+
except:
321+
exception_called = True
322+
assert(exception_called)
313323

314324
# should add missing 'added' element
315325
segment2 = {"name": 'seg', "removed": [], "since": -1, "till": 12}

0 commit comments

Comments
 (0)