Make sure to handle deleted prefixes properly

This commit is contained in:
Joseph Schorr 2014-10-15 11:57:54 -04:00
parent da28bc4ce9
commit dba75a08af
2 changed files with 33 additions and 1 deletions

View file

@ -310,5 +310,32 @@ class TestStreamLayerMerger(unittest.TestCase):
self.assertHasFile(squashed, 'foo/some_file', 'baz')
self.assertDoesNotHaveFile(squashed, 'foo/another_file')
def test_delete_directory_prefix(self):
third_layer = self.create_layer(
foo = 'foobar/some_file',
bar = 'foo/another_file')
second_layer = self.create_layer(
_ = 'foo/')
squashed = self.squash_layers([second_layer, third_layer])
self.assertHasFile(squashed, 'foobar/some_file', 'foo')
self.assertDoesNotHaveFile(squashed, 'foo/another_file')
def test_delete_directory_pre_prefix(self):
third_layer = self.create_layer(
foo = 'foobar/baz/some_file',
bar = 'foo/another_file')
second_layer = self.create_layer(
_ = 'foo/')
squashed = self.squash_layers([second_layer, third_layer])
self.assertHasFile(squashed, 'foobar/baz/some_file', 'foo')
self.assertDoesNotHaveFile(squashed, 'foo/another_file')
if __name__ == '__main__':
unittest.main()