From fe93f73aac3ac873b82b096b484af87bc8de4d92 Mon Sep 17 00:00:00 2001
From: Josh Durgin <jdurgin@redhat.com>
Date: Tue, 20 Jan 2015 17:12:15 -0800
Subject: [PATCH] test: fix rbd cli tests for new feature bit

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
---
 src/test/cli-integration/rbd/defaults.t       | 30 ++++++++++------
 .../cli-integration/rbd/formatted-output.t    | 36 ++++++++++++-------
 2 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/src/test/cli-integration/rbd/defaults.t b/src/test/cli-integration/rbd/defaults.t
index 10f3f3f2b89f2..eec77ed7654b3 100644
--- a/src/test/cli-integration/rbd/defaults.t
+++ b/src/test/cli-integration/rbd/defaults.t
@@ -30,7 +30,8 @@ Plain create with various options specified via usual cli arguments
       "block_name_prefix": "rbd_data.*",  (glob)
       "features": [
           "layering", 
-          "striping"
+          "striping", 
+          "exclusive"
       ], 
       "format": 2, 
       "name": "test", 
@@ -46,7 +47,8 @@ Plain create with various options specified via usual cli arguments
       "block_name_prefix": "rbd_data.*",  (glob)
       "features": [
           "layering", 
-          "striping"
+          "striping", 
+          "exclusive"
       ], 
       "format": 2, 
       "name": "test", 
@@ -62,7 +64,8 @@ Plain create with various options specified via usual cli arguments
       "block_name_prefix": "rbd_data.*",  (glob)
       "features": [
           "layering", 
-          "striping"
+          "striping", 
+          "exclusive"
       ], 
       "format": 2, 
       "name": "test", 
@@ -83,7 +86,8 @@ Format 2 Usual arguments with custom rbd_default_* params
       "block_name_prefix": "rbd_data.*",  (glob)
       "features": [
           "layering", 
-          "striping"
+          "striping", 
+          "exclusive"
       ], 
       "format": 2, 
       "name": "test", 
@@ -101,7 +105,8 @@ Format 2 Usual arguments with custom rbd_default_* params
       "block_name_prefix": "rbd_data.*",  (glob)
       "features": [
           "layering", 
-          "striping"
+          "striping", 
+          "exclusive"
       ], 
       "format": 2, 
       "name": "test", 
@@ -119,7 +124,8 @@ Format 2 Usual arguments with custom rbd_default_* params
       "block_name_prefix": "rbd_data.*",  (glob)
       "features": [
           "layering", 
-          "striping"
+          "striping", 
+          "exclusive"
       ], 
       "format": 2, 
       "name": "test", 
@@ -152,7 +158,8 @@ Format 1 Usual arguments with custom rbd_default_* params
       "block_name_prefix": "rbd_data.*",  (glob)
       "features": [
           "layering", 
-          "striping"
+          "striping", 
+          "exclusive"
       ], 
       "format": 2, 
       "name": "test", 
@@ -168,7 +175,8 @@ Format 1 Usual arguments with custom rbd_default_* params
       "block_name_prefix": "rbd_data.*",  (glob)
       "features": [
           "layering", 
-          "striping"
+          "striping", 
+          "exclusive"
       ], 
       "format": 2, 
       "name": "test", 
@@ -184,7 +192,8 @@ Format 1 Usual arguments with custom rbd_default_* params
       "block_name_prefix": "rbd_data.*",  (glob)
       "features": [
           "layering", 
-          "striping"
+          "striping", 
+          "exclusive"
       ], 
       "format": 2, 
       "name": "test", 
@@ -200,7 +209,8 @@ Format 1 Usual arguments with custom rbd_default_* params
       "block_name_prefix": "rbd_data.*",  (glob)
       "features": [
           "layering", 
-          "striping"
+          "striping", 
+          "exclusive"
       ], 
       "format": 2, 
       "name": "test", 
diff --git a/src/test/cli-integration/rbd/formatted-output.t b/src/test/cli-integration/rbd/formatted-output.t
index 7c657554d8437..1c090b6f50bea 100644
--- a/src/test/cli-integration/rbd/formatted-output.t
+++ b/src/test/cli-integration/rbd/formatted-output.t
@@ -110,13 +110,14 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
   \torder 22 (4096 kB objects) (esc)
   [^^]+ (re)
   \tformat: 2 (esc)
-  \tfeatures: layering (esc)
+  \tfeatures: layering, exclusive (esc)
   $ rbd info bar --format json | python -mjson.tool | sed 's/,$/, /'
   {
       "block_name_prefix": "rbd_data.*",  (glob)
       "features": [
           "layering", 
-          "striping"
+          "striping", 
+          "exclusive"
       ], 
       "format": 2, 
       "name": "bar", 
@@ -137,6 +138,7 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
     <features>
       <feature>layering</feature>
       <feature>striping</feature>
+      <feature>exclusive</feature>
     </features>
   </image>
   $ rbd info bar@snap
@@ -145,14 +147,15 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
   \torder 22 (4096 kB objects) (esc)
   [^^]+ (re)
   \tformat: 2 (esc)
-  \tfeatures: layering (esc)
+  \tfeatures: layering, exclusive (esc)
   \tprotected: True (esc)
   $ rbd info bar@snap --format json | python -mjson.tool | sed 's/,$/, /'
   {
       "block_name_prefix": "rbd_data.*",  (glob)
       "features": [
           "layering", 
-          "striping"
+          "striping", 
+          "exclusive"
       ], 
       "format": 2, 
       "name": "bar", 
@@ -174,6 +177,7 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
     <features>
       <feature>layering</feature>
       <feature>striping</feature>
+      <feature>exclusive</feature>
     </features>
     <protected>true</protected>
   </image>
@@ -183,14 +187,15 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
   \torder 22 (4096 kB objects) (esc)
   [^^]+ (re)
   \tformat: 2 (esc)
-  \tfeatures: layering (esc)
+  \tfeatures: layering, exclusive (esc)
   \tprotected: False (esc)
   $ rbd info bar@snap2 --format json | python -mjson.tool | sed 's/,$/, /'
   {
       "block_name_prefix": "rbd_data.*",  (glob)
       "features": [
           "layering", 
-          "striping"
+          "striping", 
+          "exclusive"
       ], 
       "format": 2, 
       "name": "bar", 
@@ -212,6 +217,7 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
     <features>
       <feature>layering</feature>
       <feature>striping</feature>
+      <feature>exclusive</feature>
     </features>
     <protected>false</protected>
   </image>
@@ -221,13 +227,14 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
   \torder 22 (4096 kB objects) (esc)
   [^^]+ (re)
   \tformat: 2 (esc)
-  \tfeatures: layering (esc)
+  \tfeatures: layering, exclusive (esc)
   $ rbd info baz --format json | python -mjson.tool | sed 's/,$/, /'
   {
       "block_name_prefix": "rbd_data.*",  (glob)
       "features": [
           "layering", 
-          "striping"
+          "striping", 
+          "exclusive"
       ], 
       "format": 2, 
       "name": "baz", 
@@ -248,6 +255,7 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
     <features>
       <feature>layering</feature>
       <feature>striping</feature>
+      <feature>exclusive</feature>
     </features>
   </image>
   $ rbd info quux
@@ -282,13 +290,14 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
   \torder 22 (4096 kB objects) (esc)
   [^^]+ (re)
   \tformat: 2 (esc)
-  \tfeatures: layering (esc)
+  \tfeatures: layering, exclusive (esc)
   $ rbd info rbd_other/child --format json | python -mjson.tool | sed 's/,$/, /'
   {
       "block_name_prefix": "rbd_data.*",  (glob)
       "features": [
           "layering", 
-          "striping"
+          "striping", 
+          "exclusive"
       ], 
       "format": 2, 
       "name": "child", 
@@ -309,6 +318,7 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
     <features>
       <feature>layering</feature>
       <feature>striping</feature>
+      <feature>exclusive</feature>
     </features>
   </image>
   $ rbd info rbd_other/child@snap
@@ -317,7 +327,7 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
   \torder 22 (4096 kB objects) (esc)
   [^^]+ (re)
   \tformat: 2 (esc)
-  \tfeatures: layering (esc)
+  \tfeatures: layering, exclusive (esc)
   \tprotected: False (esc)
   \tparent: rbd/bar@snap (esc)
   \toverlap: 512 MB (esc)
@@ -326,7 +336,8 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
       "block_name_prefix": "rbd_data.*",  (glob)
       "features": [
           "layering", 
-          "striping"
+          "striping", 
+          "exclusive"
       ], 
       "format": 2, 
       "name": "child", 
@@ -354,6 +365,7 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
     <features>
       <feature>layering</feature>
       <feature>striping</feature>
+      <feature>exclusive</feature>
     </features>
     <protected>false</protected>
     <parent>
-- 
2.39.5