mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-27 02:08:54 +00:00
Code Issues Releases Wiki Activity

Fix tests which relied on dropping oldest archive when retention target not met

Browse source
This commit is contained in:
Alf Mikula 2020-09-09 05:19:06 -07:00
parent 943088df2c
commit 69a58d2be0
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/borg/testsuite/archiver.py
View file

@ -2029,7 +2029,7 @@ def test_prune_repository(self):
self.cmd('create', self.repository_location + '::test3.checkpoint', src_dir) self.cmd('create', self.repository_location + '::test3.checkpoint', src_dir)
self.cmd('create', self.repository_location + '::test3.checkpoint.1', src_dir) self.cmd('create', self.repository_location + '::test3.checkpoint.1', src_dir)
self.cmd('create', self.repository_location + '::test4.checkpoint', src_dir) self.cmd('create', self.repository_location + '::test4.checkpoint', src_dir)
output = self.cmd('prune', '--list', '--dry-run', self.repository_location, '--keep-daily=2') output = self.cmd('prune', '--list', '--dry-run', self.repository_location, '--keep-daily=1')
assert re.search(r'Would prune:\s+test1', output) assert re.search(r'Would prune:\s+test1', output)
# must keep the latest non-checkpoint archive: # must keep the latest non-checkpoint archive:
assert re.search(r'Keeping archive \(rule: daily #1\):\s+test2', output) assert re.search(r'Keeping archive \(rule: daily #1\):\s+test2', output)
@ -2041,7 +2041,7 @@ def test_prune_repository(self):
self.assert_in('test3.checkpoint', output) self.assert_in('test3.checkpoint', output)
self.assert_in('test3.checkpoint.1', output) self.assert_in('test3.checkpoint.1', output)
self.assert_in('test4.checkpoint', output) self.assert_in('test4.checkpoint', output)
self.cmd('prune', self.repository_location, '--keep-daily=2') self.cmd('prune', self.repository_location, '--keep-daily=1')
output = self.cmd('list', '--consider-checkpoints', self.repository_location) output = self.cmd('list', '--consider-checkpoints', self.repository_location)
self.assert_not_in('test1', output) self.assert_not_in('test1', output)
# the latest non-checkpoint archive must be still there: # the latest non-checkpoint archive must be still there:
@ -2063,13 +2063,13 @@ def test_prune_repository_save_space(self):
self.cmd('init', '--encryption=repokey', self.repository_location) self.cmd('init', '--encryption=repokey', self.repository_location)
self.cmd('create', self.repository_location + '::test1', src_dir) self.cmd('create', self.repository_location + '::test1', src_dir)
self.cmd('create', self.repository_location + '::test2', src_dir) self.cmd('create', self.repository_location + '::test2', src_dir)
output = self.cmd('prune', '--list', '--dry-run', self.repository_location, '--keep-daily=2') output = self.cmd('prune', '--list', '--dry-run', self.repository_location, '--keep-daily=1')
assert re.search(r'Keeping archive \(rule: daily #1\):\s+test2', output) assert re.search(r'Keeping archive \(rule: daily #1\):\s+test2', output)
assert re.search(r'Would prune:\s+test1', output) assert re.search(r'Would prune:\s+test1', output)
output = self.cmd('list', self.repository_location) output = self.cmd('list', self.repository_location)
self.assert_in('test1', output) self.assert_in('test1', output)
self.assert_in('test2', output) self.assert_in('test2', output)
self.cmd('prune', '--save-space', self.repository_location, '--keep-daily=2') self.cmd('prune', '--save-space', self.repository_location, '--keep-daily=1')
output = self.cmd('list', self.repository_location) output = self.cmd('list', self.repository_location)
self.assert_not_in('test1', output) self.assert_not_in('test1', output)
self.assert_in('test2', output) self.assert_in('test2', output)
@ -2080,7 +2080,7 @@ def test_prune_repository_prefix(self):
self.cmd('create', self.repository_location + '::foo-2015-08-12-20:00', src_dir) self.cmd('create', self.repository_location + '::foo-2015-08-12-20:00', src_dir)
self.cmd('create', self.repository_location + '::bar-2015-08-12-10:00', src_dir) self.cmd('create', self.repository_location + '::bar-2015-08-12-10:00', src_dir)
self.cmd('create', self.repository_location + '::bar-2015-08-12-20:00', src_dir) self.cmd('create', self.repository_location + '::bar-2015-08-12-20:00', src_dir)
output = self.cmd('prune', '--list', '--dry-run', self.repository_location, '--keep-daily=2', '--prefix=foo-') output = self.cmd('prune', '--list', '--dry-run', self.repository_location, '--keep-daily=1', '--prefix=foo-')
assert re.search(r'Keeping archive \(rule: daily #1\):\s+foo-2015-08-12-20:00', output) assert re.search(r'Keeping archive \(rule: daily #1\):\s+foo-2015-08-12-20:00', output)
assert re.search(r'Would prune:\s+foo-2015-08-12-10:00', output) assert re.search(r'Would prune:\s+foo-2015-08-12-10:00', output)
output = self.cmd('list', self.repository_location) output = self.cmd('list', self.repository_location)
@ -2088,7 +2088,7 @@ def test_prune_repository_prefix(self):
self.assert_in('foo-2015-08-12-20:00', output) self.assert_in('foo-2015-08-12-20:00', output)
self.assert_in('bar-2015-08-12-10:00', output) self.assert_in('bar-2015-08-12-10:00', output)
self.assert_in('bar-2015-08-12-20:00', output) self.assert_in('bar-2015-08-12-20:00', output)
self.cmd('prune', self.repository_location, '--keep-daily=2', '--prefix=foo-') self.cmd('prune', self.repository_location, '--keep-daily=1', '--prefix=foo-')
output = self.cmd('list', self.repository_location) output = self.cmd('list', self.repository_location)
self.assert_not_in('foo-2015-08-12-10:00', output) self.assert_not_in('foo-2015-08-12-10:00', output)
self.assert_in('foo-2015-08-12-20:00', output) self.assert_in('foo-2015-08-12-20:00', output)
@ -2101,7 +2101,7 @@ def test_prune_repository_glob(self):
self.cmd('create', self.repository_location + '::2015-08-12-20:00-foo', src_dir) self.cmd('create', self.repository_location + '::2015-08-12-20:00-foo', src_dir)
self.cmd('create', self.repository_location + '::2015-08-12-10:00-bar', src_dir) self.cmd('create', self.repository_location + '::2015-08-12-10:00-bar', src_dir)
self.cmd('create', self.repository_location + '::2015-08-12-20:00-bar', src_dir) self.cmd('create', self.repository_location + '::2015-08-12-20:00-bar', src_dir)
output = self.cmd('prune', '--list', '--dry-run', self.repository_location, '--keep-daily=2', '--glob-archives=2015-*-foo') output = self.cmd('prune', '--list', '--dry-run', self.repository_location, '--keep-daily=1', '--glob-archives=2015-*-foo')
assert re.search(r'Keeping archive \(rule: daily #1\):\s+2015-08-12-20:00-foo', output) assert re.search(r'Keeping archive \(rule: daily #1\):\s+2015-08-12-20:00-foo', output)
assert re.search(r'Would prune:\s+2015-08-12-10:00-foo', output) assert re.search(r'Would prune:\s+2015-08-12-10:00-foo', output)
output = self.cmd('list', self.repository_location) output = self.cmd('list', self.repository_location)
@ -2109,7 +2109,7 @@ def test_prune_repository_glob(self):
self.assert_in('2015-08-12-20:00-foo', output) self.assert_in('2015-08-12-20:00-foo', output)
self.assert_in('2015-08-12-10:00-bar', output) self.assert_in('2015-08-12-10:00-bar', output)
self.assert_in('2015-08-12-20:00-bar', output) self.assert_in('2015-08-12-20:00-bar', output)
self.cmd('prune', self.repository_location, '--keep-daily=2', '--glob-archives=2015-*-foo') self.cmd('prune', self.repository_location, '--keep-daily=1', '--glob-archives=2015-*-foo')
output = self.cmd('list', self.repository_location) output = self.cmd('list', self.repository_location)
self.assert_not_in('2015-08-12-10:00-foo', output) self.assert_not_in('2015-08-12-10:00-foo', output)
self.assert_in('2015-08-12-20:00-foo', output) self.assert_in('2015-08-12-20:00-foo', output)