vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-05-06 22:18:28 +00:00
Code Issues Projects Releases Wiki Activity

Support for -no-remove while merging snapshots. #57

Browse Source
This commit is contained in:
Andrey Smirnov
2014-05-29 18:05:52 +04:00
parent a1e360b07b
commit c72ef05a2a
2 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/t05_snapshot/merge.py
+48
View File
@@ -136,3 +136,51 @@ class MergeSnapshot8Test(BaseTest):
]
runCmd = "aptly snapshot diff snap4 snap5"
expectedCode = 0
class MergeSnapshot9Test(BaseTest):
"""
merge snapshots: -no-remove
"""
fixtureDB = True
fixtureCmds = [
"aptly snapshot create snap1 from mirror wheezy-main",
"aptly snapshot create snap2 from mirror wheezy-non-free",
"aptly snapshot create snap3 from mirror wheezy-backports",
]
runCmd = "aptly snapshot merge -no-remove snap4 snap1 snap2 snap3"
expectedCode = 0
def check(self):
def remove_created_at(s):
return re.sub(r"Created At: [0-9:A-Za-z -]+\n", "", s)
self.check_output()
self.check_cmd_output("aptly snapshot show -with-packages snap4", "snapshot_show", match_prepare=remove_created_at)
class MergeSnapshot10Test(BaseTest):
"""
merge snapshots: compare -no-remove and regular
"""
fixtureDB = True
fixtureCmds = [
"aptly snapshot create snap1 from mirror wheezy-main",
"aptly snapshot create snap2 from mirror wheezy-non-free",
"aptly snapshot create snap3 from mirror wheezy-backports",
"aptly snapshot merge snap4 snap3 snap2 snap1",
"aptly snapshot merge -no-remove snap5 snap3 snap2 snap1",
]
runCmd = "aptly snapshot diff snap4 snap5"
expectedCode = 0
class MergeSnapshot11Test(BaseTest):
"""
merge snapshots: -no-remove & -latest conflict
"""
fixtureCmds = [
"aptly snapshot create snap1 empty"
]
runCmd = "aptly snapshot merge -no-remove -latest snap2 snap1"
expectedCode = 1