test: Atomically update file data source file

launchdarkly · Aug 13, 2024 · c8b0f33 · c8b0f33
1 parent 4bfcdb8
commit c8b0f33
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,6 +49,30 @@ jobs:
  - name: Run tests
  run: make test
 
+ - run: make test
+ - run: make test
+ - run: make test
+ - run: make test
+ - run: make test
+ - run: make test
+ - run: make test
+ - run: make test
+ - run: make test
+ - run: make test
+ - run: make test
+ - run: make test
+ - run: make test
+ - run: make test
+ - run: make test
+ - run: make test
+ - run: make test
+ - run: make test
+ - run: make test
+ - run: make test
+ - run: make test
+ - run: make test
+ - run: make test
+
  - name: Verify typehints
  run: make lint
 

diff --git a/ldclient/impl/integrations/files/file_data_source.py b/ldclient/impl/integrations/files/file_data_source.py
@@ -112,6 +112,10 @@ def _load_file(self, path, all_data):
  with open(path, 'r') as f:
  content = f.read()
  parsed = self._parse_content(content)
+
+ if type(parsed) is not dict:
+ parsed = {}
+
  for key, flag in parsed.get('flags', {}).items():
  _sanitize_json_item(flag)
  self._add_item(all_data, FEATURES, flag)
@@ -213,4 +217,5 @@ def _check_file_times(self):
  ret[path] = os.path.getmtime(path)
  except:
  ret[path] = None
+
  return ret
diff --git a/ldclient/testing/test_file_data_source.py b/ldclient/testing/test_file_data_source.py
@@ -117,8 +117,8 @@ def make_temp_file(content):
  return path
 
 def replace_file(path, content):
- with open(path, 'w') as f:
-  f.write(content)
+ temp_path = make_temp_file(content)
+ os.rename(temp_path, path)
 
 def test_does_not_load_data_prior_to_start():
  path = make_temp_file('{"flagValues":{"key":"value"}}')