Sync writes __source__ falsely into frozen layers #130
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Wiseqube
changed the title
gandie
reviewed
Sep 6, 2024
There was a problem hiding this comment.
One typo, also i suggest being extra suspicious:
diff --git a/perfact/zodbsync/tests/test_sync.py b/perfact/zodbsync/tests/test_sync.py
index 0c27784..f545d6c 100644
--- a/perfact/zodbsync/tests/test_sync.py
+++ b/perfact/zodbsync/tests/test_sync.py
@@ -2179,6 +2179,10 @@ class TestSync():
# both meta and source file are in custom layer
assert os.path.exists(os.path.join(root, 'blob/__meta__'))
assert os.path.exists(os.path.join(root, 'blob/__source__.txt'))
- with open('{}/__root__/blob/__source__.txt'.format(layer)) as f:
+ source_fmt = '{}/__root__/blob/__source__.txt'
+ with open(source_fmt.format(layer)) as f:
# source in layer should still be empty
assert f.read() == ''
+ with open(source_fmt.format(self.repo.path)) as f:
+ # ... content is in custom layer!
+ assert f.read() == 'text_content'
perfact/zodbsync/tests/test_sync.py
Outdated
|
|
||
| def test_layer_frozen(self): | ||
| """ | ||
| Verify that changed files are propery written into the custom |
There was a problem hiding this comment.
Thanks for the input. I've implemented both changes!
gandie
reviewed
Sep 7, 2024
There was a problem hiding this comment.
What about this one to make things a little more clear (tests seem cool with it):
diff --git a/perfact/zodbsync/zodbsync.py b/perfact/zodbsync/zodbsync.py
index c0eaf01..85cf1c0 100644
--- a/perfact/zodbsync/zodbsync.py
+++ b/perfact/zodbsync/zodbsync.py
@@ -476,7 +476,7 @@ class ZODBSync:
if old_data != new_data:
# Path in top layer, might be different than the one where we read
# the content
- write_base = os.path.join(self.app_dir, path.lstrip('/'))
+ write_base = self.fs_path(path)
os.makedirs(write_base, exist_ok=True)
self.logger.debug("Will write %d bytes of metadata" % len(fmt))Comment and docstring of fs_path then match nicely imo
|
@gandie accidentially put this additional reafactoring into a branch which is already merged now, so I guess ready for review again! |
viktordick
approved these changes
Sep 9, 2024
| with self.runner.sync.tm: | ||
| self.app.manage_addProduct['OFSP'].manage_addFile(id='blob') | ||
|
|
||
| with self.addlayer(frozen=True) as layer: |
There was a problem hiding this comment.
Pretty sure that frozen = True is the default for layers below the top-most custom layer. So not sure why this was necessary, but it still is OK.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes an issue where zodbsync was overwriting the contents of a source-file in a frozen layer.
The test-case is as follows:
The expected behaviour would be that the changed meta and source files are both written into the custom-layer. The actual behaviour is that the
__meta__-File is correctly written into the custom-layer but the__source__-File is modified in the frozen layer below!The issue was that the path which was generated for the source-file was based on the layer-path while the path for the meta-file was generated based upon the custom upper layer!