From: Sage Weil <sage.weil@dreamhost.com>
Date: Sun, 13 Nov 2011 22:07:01 +0000 (-0800)
Subject: ceph-authtool: fix clitests
X-Git-Tag: v0.39~61
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=18009866f2c3e26587e70f998ff4ac5d5abe6afb;p=ceph-ci.git

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 d991b6767fd..2bfcce0b12d 100644
--- 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 3d9ae706e73..9681d2acfeb 100644
--- 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 a24f6acdd77..84e636e633d 100644
--- 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 abd44eca283..00f4ed5e0f6 100644
--- 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 188a1e14788..e64ac9a3c31 100644
--- 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)