From 3800f2c9577a64fc96b961e257cc5369c9a38019 Mon Sep 17 00:00:00 2001
From: Ryan Uber <ru@ryanuber.com>
Date: Wed, 23 Apr 2014 00:25:44 -0700
Subject: [PATCH] Added CLI test for snapshot merge with latest flag

---
 system/t05_snapshot/MergeSnapshot6Test_gold |  3 +++
 system/t05_snapshot/merge.py                | 14 ++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 system/t05_snapshot/MergeSnapshot6Test_gold

diff --git a/system/t05_snapshot/MergeSnapshot6Test_gold b/system/t05_snapshot/MergeSnapshot6Test_gold
new file mode 100644
index 00000000..eb356509
--- /dev/null
+++ b/system/t05_snapshot/MergeSnapshot6Test_gold
@@ -0,0 +1,3 @@
+
+Snapshot snap4 successfully created.
+You can run 'aptly publish snapshot snap4' to publish snapshot as Debian repository.
diff --git a/system/t05_snapshot/merge.py b/system/t05_snapshot/merge.py
index 3d25e788..842e7e63 100644
--- a/system/t05_snapshot/merge.py
+++ b/system/t05_snapshot/merge.py
@@ -78,3 +78,17 @@ class MergeSnapshot5Test(BaseTest):
     ]
     runCmd = "aptly snapshot merge snap1 snap1"
     expectedCode = 1
+
+
+class MergeSnapshot6Test(BaseTest):
+    """
+    merge snapshots: use latest versions only
+    """
+    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 -latest snap4 snap1 snap2 snap3"
+    expectedCode = 0