test/rgw: more test work

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

diff --git a/src/test/rgw/test-rgw-common.sh b/src/test/rgw/test-rgw-common.sh
index 6193822eb94c885a5d046549b3ce52ba0cfae789..3729098eeea1e089e2124c7882437ebe016ccf92 100644 (file)
--- a/src/test/rgw/test-rgw-common.sh
+++ b/src/test/rgw/test-rgw-common.sh
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+function _assert {
+  src=$1; shift
+  lineno=$1; shift
+  [ "$@" ] || echo "$src: $lineno: assert failed: $@" || exit 1
+}
+
+assert="eval _assert \$BASH_SOURCE \$LINENO"
+
 function var_to_python_json_index {
   echo "['$1']" | sed "s/\./'\]\['/g"
 }

diff --git a/src/test/rgw/test-rgw-meta-sync.sh b/src/test/rgw/test-rgw-meta-sync.sh
index 3882dcb10d4f4dcf26b2544b5f91adec71779971..90b45934f4f1530d382ebd3bc728b55d6aaf8b0d 100755 (executable)
--- a/src/test/rgw/test-rgw-meta-sync.sh
+++ b/src/test/rgw/test-rgw-meta-sync.sh
@@ -16,9 +16,9 @@ function get_metadata_sync_status {
 
   sync_markers=$(json_extract sync_status.markers $meta_sync_status_json)
 
-  # num_shards=$(python_array_len $sync_markers)
+  num_shards2=$(python_array_len $sync_markers)
 
-  # echo $num_shards
+  [ "$global_sync_status" == "sync" ] && assert $num_shards2 -eq $num_shards
 
   sync_states=$(project_python_array_field val.state $sync_markers)
   eval secondary_status=$(project_python_array_field val.marker $sync_markers)

diff --git a/src/test/rgw/test-rgw-multisite.sh b/src/test/rgw/test-rgw-multisite.sh
index 2022f85248195c9fa1e4f042ba85f7549334038b..337b21725ce734a469c64531f47038bc5e1850bb 100755 (executable)
--- a/src/test/rgw/test-rgw-multisite.sh
+++ b/src/test/rgw/test-rgw-multisite.sh
@@ -5,7 +5,6 @@
 
 set -e
 
-
 realm_name=earth
 zg=us
 zone1=${zg}-1
@@ -36,3 +35,9 @@ init_zone_in_existing_zg 2 $realm_name $zg $zone1 $zone1_port $system_access_key
 
 
 wait_for_meta_sync 1 2
+
+$(rgw_admin 1) user create --uid=user1 --display-name='user one' --secret=user1secret --access-key=USER1ACCESSKEY
+$(rgw_admin 1) user create --uid=user2 --display-name='user two' --secret=user2secret --access-key=USER2ACCESSKEY
+
+wait_for_meta_sync 1 2
+