diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/geo-rep.rc | 10 | ||||
| -rw-r--r-- | tests/geo-rep/georep-basic-dr-rsync.t | 27 | ||||
| -rw-r--r-- | tests/geo-rep/georep-basic-dr-tarssh.t | 23 |
3 files changed, 38 insertions, 22 deletions
diff --git a/tests/geo-rep.rc b/tests/geo-rep.rc index 208069c6918..e811f9a5b76 100644 --- a/tests/geo-rep.rc +++ b/tests/geo-rep.rc @@ -58,6 +58,16 @@ function create_data() # Rename - Dir mv ${master_mnt}/${prefix}_d3 ${master_mnt}/${prefix}_d4 + + # chown + touch ${master_mnt}/${prefix}_chown_f1 + chown 1000:1000 ${master_mnt}/${prefix}_chown_f1 +} + +function chown_file_ok() +{ + local file_owner=$(stat --format "%u:%g" "$1" 2>/dev/null) + if test "X$file_owner" != "X1000:1000"; then return 1;fi } function regular_file_ok() diff --git a/tests/geo-rep/georep-basic-dr-rsync.t b/tests/geo-rep/georep-basic-dr-rsync.t index bcb31d90c9e..220b4713c69 100644 --- a/tests/geo-rep/georep-basic-dr-rsync.t +++ b/tests/geo-rep/georep-basic-dr-rsync.t @@ -75,11 +75,12 @@ TEST hardlink_file_ok ${slave_mnt}/hybrid_f1 ${slave_mnt}/hybrid_hl1 #25 TEST unlink_ok ${slave_mnt}/hybrid_f2 TEST unlink_ok ${slave_mnt}/hybrid_d2 TEST data_ok ${slave_mnt}/hybrid_f1 "HelloWorld!" +TEST chown_file_ok ${slave_mnt}/hybrid_chown_f1 #Check History Crawl. -TEST $GEOREP_CLI $master $slave stop -TEST create_data "history" #30 +TEST $GEOREP_CLI $master $slave stop #30 +TEST create_data "history" TEST $GEOREP_CLI $master $slave start sleep 10 EXPECT 2 check_status_num_rows "Active" @@ -89,37 +90,39 @@ EXPECT 2 check_status_num_rows "Passive" #data_tests "history" sleep 15 -TEST regular_file_ok ${slave_mnt}/history_f1 -TEST directory_ok ${slave_mnt}/history_d1 #35 +TEST regular_file_ok ${slave_mnt}/history_f1 #35 +TEST directory_ok ${slave_mnt}/history_d1 TEST rename_ok ${slave_mnt}/history_f3 ${slave_mnt}/history_f4 TEST rename_ok ${slave_mnt}/history_d3 ${slave_mnt}/history_d4 TEST symlink_ok history_f1 ${slave_mnt}/history_sl1 -TEST hardlink_file_ok ${slave_mnt}/history_f1 ${slave_mnt}/history_hl1 -TEST unlink_ok ${slave_mnt}/history_f2 #40 +TEST hardlink_file_ok ${slave_mnt}/history_f1 ${slave_mnt}/history_hl1 #40 +TEST unlink_ok ${slave_mnt}/history_f2 TEST unlink_ok ${slave_mnt}/history_d2 TEST data_ok ${slave_mnt}/history_f1 "HelloWorld!" +TEST chown_file_ok ${slave_mnt}/history_chown_f1 #Check History Crawl. -TEST create_data "changelog" +TEST create_data "changelog" #45 sleep 15 TEST check_status "Changelog Crawl" #data_tests "changelog" sleep 15 -TEST regular_file_ok ${slave_mnt}/changelog_f1 #45 +TEST regular_file_ok ${slave_mnt}/changelog_f1 TEST directory_ok ${slave_mnt}/changelog_d1 TEST rename_ok ${slave_mnt}/changelog_f3 ${slave_mnt}/changelog_f4 -TEST rename_ok ${slave_mnt}/changelog_d3 ${slave_mnt}/changelog_d4 +TEST rename_ok ${slave_mnt}/changelog_d3 ${slave_mnt}/changelog_d4 #50 TEST symlink_ok changelog_f1 ${slave_mnt}/changelog_sl1 -TEST hardlink_file_ok ${slave_mnt}/changelog_f1 ${slave_mnt}/changelog_hl1 #50 +TEST hardlink_file_ok ${slave_mnt}/changelog_f1 ${slave_mnt}/changelog_hl1 TEST unlink_ok ${slave_mnt}/changelog_f2 TEST unlink_ok ${slave_mnt}/changelog_d2 -TEST data_ok ${slave_mnt}/changelog_f1 "HelloWorld!" +TEST data_ok ${slave_mnt}/changelog_f1 "HelloWorld!" #55 +TEST chown_file_ok ${slave_mnt}/changelog_chown_f1 #Stop Geo-rep TEST $GEOREP_CLI $master $slave stop #Delete Geo-rep -TEST $GEOREP_CLI $master $slave delete #55 +TEST $GEOREP_CLI $master $slave delete cleanup; diff --git a/tests/geo-rep/georep-basic-dr-tarssh.t b/tests/geo-rep/georep-basic-dr-tarssh.t index 2985b2e5de0..cf661d08782 100644 --- a/tests/geo-rep/georep-basic-dr-tarssh.t +++ b/tests/geo-rep/georep-basic-dr-tarssh.t @@ -80,46 +80,49 @@ TEST hardlink_file_ok ${slave_mnt}/hybrid_f1 ${slave_mnt}/hybrid_hl1 TEST unlink_ok ${slave_mnt}/hybrid_f2 TEST unlink_ok ${slave_mnt}/hybrid_d2 TEST data_ok ${slave_mnt}/hybrid_f1 "HelloWorld!" +TEST chown_file_ok ${slave_mnt}/hybrid_chown_f1 #30 #Check History Crawl. -TEST $GEOREP_CLI $master $slave stop #30 +TEST $GEOREP_CLI $master $slave stop TEST create_data "history" TEST $GEOREP_CLI $master $slave start sleep 10 EXPECT 2 check_status_num_rows "Active" -EXPECT 2 check_status_num_rows "Passive" +EXPECT 2 check_status_num_rows "Passive" #35 #data_tests "history" sleep 15 -TEST regular_file_ok ${slave_mnt}/history_f1 #35 +TEST regular_file_ok ${slave_mnt}/history_f1 TEST directory_ok ${slave_mnt}/history_d1 TEST rename_ok ${slave_mnt}/history_f3 ${slave_mnt}/history_f4 TEST rename_ok ${slave_mnt}/history_d3 ${slave_mnt}/history_d4 -TEST symlink_ok history_f1 ${slave_mnt}/history_sl1 -TEST hardlink_file_ok ${slave_mnt}/history_f1 ${slave_mnt}/history_hl1 #40 +TEST symlink_ok history_f1 ${slave_mnt}/history_sl1 #40 +TEST hardlink_file_ok ${slave_mnt}/history_f1 ${slave_mnt}/history_hl1 TEST unlink_ok ${slave_mnt}/history_f2 TEST unlink_ok ${slave_mnt}/history_d2 TEST data_ok ${slave_mnt}/history_f1 "HelloWorld!" +TEST chown_file_ok ${slave_mnt}/history_chown_f1 #45 #Check History Crawl. TEST create_data "changelog" sleep 15 -TEST check_status "Changelog Crawl" #45 +TEST check_status "Changelog Crawl" #data_tests "changelog" sleep 15 TEST regular_file_ok ${slave_mnt}/changelog_f1 TEST directory_ok ${slave_mnt}/changelog_d1 -TEST rename_ok ${slave_mnt}/changelog_f3 ${slave_mnt}/changelog_f4 +TEST rename_ok ${slave_mnt}/changelog_f3 ${slave_mnt}/changelog_f4 #50 TEST rename_ok ${slave_mnt}/changelog_d3 ${slave_mnt}/changelog_d4 -TEST symlink_ok changelog_f1 ${slave_mnt}/changelog_sl1 #50 +TEST symlink_ok changelog_f1 ${slave_mnt}/changelog_sl1 TEST hardlink_file_ok ${slave_mnt}/changelog_f1 ${slave_mnt}/changelog_hl1 TEST unlink_ok ${slave_mnt}/changelog_f2 -TEST unlink_ok ${slave_mnt}/changelog_d2 +TEST unlink_ok ${slave_mnt}/changelog_d2 #55 TEST data_ok ${slave_mnt}/changelog_f1 "HelloWorld!" +TEST chown_file_ok ${slave_mnt}/changelog_chown_f1 #Stop Geo-rep -TEST $GEOREP_CLI $master $slave stop #55 +TEST $GEOREP_CLI $master $slave stop #Delete Geo-rep TEST $GEOREP_CLI $master $slave delete |