ceph-authtool: fix clitests

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/test/cli/cauthtool/add-key.t b/src/test/cli/cauthtool/add-key.t
index d991b6767fd38e65e5da1d8308e621833c72a84e..2bfcce0b12db3c1d2f28c7db43348d690cc87f93 100644 (file)
--- a/src/test/cli/cauthtool/add-key.t
+++ b/src/test/cli/cauthtool/add-key.t
@@ -8,9 +8,7 @@
   $ ceph-authtool kring --list
   [client.admin]
   \tkey = AQAK7yxNeF+nHBAA0SgSdbs8IkJrxroDeJ6SwQ== (esc)
-  \tauid = 18446744073709551615 (esc)
 
   $ cat kring
   [client.admin]
   \tkey = AQAK7yxNeF+nHBAA0SgSdbs8IkJrxroDeJ6SwQ== (esc)
-  \tauid = 18446744073709551615 (esc)

diff --git a/src/test/cli/cauthtool/cap.t b/src/test/cli/cauthtool/cap.t
index 3d9ae706e73c3bb4fbdb264a41d93b72b6dc8dda..9681d2acfeb04453cd9d240f66c77c45f81ad4aa 100644 (file)
--- a/src/test/cli/cauthtool/cap.t
+++ b/src/test/cli/cauthtool/cap.t
@@ -8,5 +8,4 @@
   $ cat kring
   [client.admin]
   \\tkey = [a-zA-Z0-9+/]+=* \(esc\) (re)
-  \\tauid = [0-9]{20} \(esc\) (re)
   \tcaps osd = "allow rx pool=swimming" (esc)

diff --git a/src/test/cli/cauthtool/create-gen-list-bin.t b/src/test/cli/cauthtool/create-gen-list-bin.t
index a24f6acdd77a18f0af848de85cef611039b8656c..84e636e633d8b93bbbc405e43a8cd4c75f776e1f 100644 (file)
--- a/src/test/cli/cauthtool/create-gen-list-bin.t
+++ b/src/test/cli/cauthtool/create-gen-list-bin.t
@@ -13,11 +13,9 @@
   $ ceph-authtool kring --list
   [client.admin]
   \\tkey = [a-zA-Z0-9+/]+=* \(esc\) (re)
-  \\tauid = [0-9]{20} \(esc\) (re)
 
 # synonym
   $ ceph-authtool kring -l
   [client.admin]
   \\tkey = [a-zA-Z0-9+/]+=* \(esc\) (re)
-  \\tauid = [0-9]{20} \(esc\) (re)
 

diff --git a/src/test/cli/cauthtool/create-gen-list.t b/src/test/cli/cauthtool/create-gen-list.t
index abd44eca283d7565f5e69bec63f2d0c3b7e46e6c..00f4ed5e0f6e210cedc9ec1ec9792923b5b97be0 100644 (file)
--- a/src/test/cli/cauthtool/create-gen-list.t
+++ b/src/test/cli/cauthtool/create-gen-list.t
@@ -9,15 +9,12 @@
   $ ceph-authtool kring --list
   [client.admin]
   \\tkey = [a-zA-Z0-9+/]+=* \(esc\) (re)
-  \\tauid = [0-9]{20} \(esc\) (re)
 
 # synonym
   $ ceph-authtool kring -l
   [client.admin]
   \\tkey = [a-zA-Z0-9+/]+=* \(esc\) (re)
-  \\tauid = [0-9]{20} \(esc\) (re)
 
   $ cat kring
   [client.admin]
   \\tkey = [a-zA-Z0-9+/]+=* \(esc\) (re)
-  \\tauid = [0-9]{20} \(esc\) (re)

diff --git a/src/test/cli/cauthtool/manpage.t b/src/test/cli/cauthtool/manpage.t
index 188a1e147886fa51f46b29afb0901d917d3c57ec..e64ac9a3c31de62b2968ae626fbc9d033d6fada7 100644 (file)
--- a/src/test/cli/cauthtool/manpage.t
+++ b/src/test/cli/cauthtool/manpage.t
@@ -43,7 +43,6 @@ To display the contents of the keyring:
   $ ceph-authtool -l keyring.bin
   [client.foo]
   \\tkey = [a-zA-Z0-9+/]+=* \(esc\) (re)
-  \\tauid = [0-9]{20} \(esc\) (re)
   \tcaps mds = "allow" (esc)
   \tcaps mon = "allow r" (esc)
   \tcaps osd = "allow rw pool=data" (esc)