features/rbd_access.feature in uricp-0.0.21 vs features/rbd_access.feature in uricp-0.0.22

@@ -77,17 +77,17 @@
     """
     And the output should contain:
     """
     rbd snap protect --id libvirt 'servers/img-testy@uricp_snap'
     """
-    And the output should contain:
+    And the output should not contain:
     """
     rbd snap unprotect --id libvirt 'servers/img-testy@uricp_snap'
     """
-    And the output should contain:
+    And the output should not contain:
     """
-    rbd snap rm --id libvirt 'servers/img-testy@uricp_snap';
+    rbd snap rm --id libvirt 'servers/img-testy@uricp_snap'
     """
     And the output should contain:
     """
     rbd clone --id libvirt 'servers/img-testy@uricp_snap' 'servers/srv-testy'
     """
@@ -101,17 +101,17 @@
     """
     And the output should contain:
     """
     rbd snap protect --id libvirt 'servers/srv-testy@uricp_snap'
     """
-    And the output should contain:
+    And the output should not contain:
     """
     rbd snap unprotect --id libvirt 'servers/srv-testy@uricp_snap'
     """
-    And the output should contain:
+    And the output should not contain:
     """
-    rbd snap rm --id libvirt 'servers/srv-testy@uricp_snap';
+    rbd snap rm --id libvirt 'servers/srv-testy@uricp_snap'
     """
     And the output should not contain:
     """
     rbd export --no-progress --id libvirt 'servers/srv-testy@uricp_snap' -
     """
@@ -129,14 +129,10 @@
     """
     And the output should contain:
     """
     rbd snap protect --id libvirt 'servers/img-testy@base'
     """
-    And the output should contain:
-    """
-    rbd flatten --id libvirt --no-progress 'servers/img-testy'
-    """
 
   Scenario: rbd to rbd - populated cache
     Given a correctly initialised cache at "/tmp/uricp"
     When I successfully run `uricp --dry-run --dry-cache --cache=/tmp/uricp rbd:///servers/img-testy rbd:///servers/srv-testy`
     And the output should not contain:
@@ -163,11 +159,11 @@
     """
     rbd snap unprotect --id libvirt 'servers/srv-testy@uricp_snap'
     """
     And the output should contain:
     """
-    rbd snap rm --id libvirt 'servers/srv-testy@uricp_snap';
+    rbd snap rm --id libvirt 'servers/srv-testy@uricp_snap'
     """
     And the output should contain:
     """
     rbd export --no-progress --id libvirt 'servers/srv-testy@uricp_snap' -
     """
@@ -190,17 +186,17 @@
     """
     And the output should contain:
     """
     rbd snap protect --id libvirt 'servers/srv-testy@uricp_snap'
     """
-    And the output should contain:
+    And the output should not contain:
     """
     rbd snap unprotect --id libvirt 'servers/srv-testy@uricp_snap'
     """
-    And the output should contain:
+    And the output should not contain:
     """
-    rbd snap rm --id libvirt 'servers/srv-testy@uricp_snap';
+    rbd snap rm --id libvirt 'servers/srv-testy@uricp_snap'
     """
     And the output should not contain:
     """
     rbd export --no-progress --id libvirt 'servers/srv-testy@uricp_snap' -
     """
@@ -217,10 +213,6 @@
     rbd snap create --id libvirt 'servers/img-testy@base'
     """
     And the output should contain:
     """
     rbd snap protect --id libvirt 'servers/img-testy@base'
-    """
-    And the output should contain:
-    """
-    rbd flatten --id libvirt --no-progress 'servers/img-testy'
     """