From 66992d1931761c7408097e12ca2dd5d32d632aec Mon Sep 17 00:00:00 2001 From: Pan Liu Date: Sun, 29 Jan 2017 00:45:30 +0800 Subject: [PATCH] test: regolden formatted-output.t for timestamp metadata of rbd snapshot Signed-off-by: Pan Liu --- .../cli-integration/rbd/formatted-output.t | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/test/cli-integration/rbd/formatted-output.t b/src/test/cli-integration/rbd/formatted-output.t index c5ecdead5570..229a4d3cb81a 100644 --- a/src/test/cli-integration/rbd/formatted-output.t +++ b/src/test/cli-integration/rbd/formatted-output.t @@ -780,14 +780,15 @@ whenever it is run. grep -v to ignore it, but still work on other distros. (glob) $ rbd snap list foo - SNAPID NAME SIZE + SNAPID NAME SIZE TIMESTAMP *snap*1024*MB* (glob) $ rbd snap list foo --format json | python -mjson.tool | sed 's/,$/, /' [ { "id": *, (glob) "name": "snap", - "size": 1073741824 + "size": 1073741824, + "timestamp": "" } ] $ rbd snap list foo --format xml | xml_pp 2>&1 | grep -v '^new version at /usr/bin/xml_pp' @@ -796,10 +797,11 @@ whenever it is run. grep -v to ignore it, but still work on other distros. * (glob) snap 1073741824 + $ rbd snap list bar - SNAPID NAME SIZE + SNAPID NAME SIZE TIMESTAMP *snap*512*MB* (glob) *snap2*1024*MB* (glob) $ rbd snap list bar --format json | python -mjson.tool | sed 's/,$/, /' @@ -807,12 +809,14 @@ whenever it is run. grep -v to ignore it, but still work on other distros. { "id": *, (glob) "name": "snap", - "size": 536870912 + "size": 536870912, + "timestamp": * (glob) }, { "id": *, (glob) "name": "snap2", - "size": 1073741824 + "size": 1073741824, + "timestamp": * (glob) } ] $ rbd snap list bar --format xml | xml_pp 2>&1 | grep -v '^new version at /usr/bin/xml_pp' @@ -821,11 +825,13 @@ whenever it is run. grep -v to ignore it, but still work on other distros. * (glob) snap 536870912 + * (glob) * (glob) snap2 1073741824 + * (glob) $ rbd snap list baz @@ -834,14 +840,15 @@ whenever it is run. grep -v to ignore it, but still work on other distros. $ rbd snap list baz --format xml | xml_pp 2>&1 | grep -v '^new version at /usr/bin/xml_pp' $ rbd snap list rbd_other/child - SNAPID NAME SIZE + SNAPID NAME SIZE TIMESTAMP *snap*512*MB* (glob) $ rbd snap list rbd_other/child --format json | python -mjson.tool | sed 's/,$/, /' [ { "id": *, (glob) "name": "snap", - "size": 536870912 + "size": 536870912, + "timestamp": * (glob) } ] $ rbd snap list rbd_other/child --format xml | xml_pp 2>&1 | grep -v '^new version at /usr/bin/xml_pp' @@ -850,6 +857,7 @@ whenever it is run. grep -v to ignore it, but still work on other distros. * (glob) snap 536870912 + * (glob) $ rbd disk-usage --pool rbd_other 2>/dev/null -- 2.47.3