diff options
| author | Kotresh HR <khiremat@redhat.com> | 2015-08-13 13:11:32 +0530 |
|---|---|---|
| committer | Venky Shankar <vshankar@redhat.com> | 2015-08-31 10:15:34 -0700 |
| commit | e012bdc721945fb6d996e3f67881a705ef966026 (patch) | |
| tree | 513c165d6fafc38a4c6ed71ef66c08d93e8fb580 /tests/geo-rep/georep-basic-dr-tarssh.t | |
| parent | 7566c94633b602156755297493fad1d24d1ba52f (diff) | |
tests: Fix return value in geo-rep tests
Remove the function 'data_tests' and TEST
each fop in testcase itself to determine
the exact test that fails.
Change-Id: Iffc3e2ac3b0fc0c7c64259fcdff8f27b146dcb9b
BUG: 1227624
Signed-off-by: Kotresh HR <khiremat@redhat.com>
Reviewed-on: http://review.gluster.org/11907
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Diffstat (limited to 'tests/geo-rep/georep-basic-dr-tarssh.t')
| -rw-r--r-- | tests/geo-rep/georep-basic-dr-tarssh.t | 45 |
1 files changed, 38 insertions, 7 deletions
diff --git a/tests/geo-rep/georep-basic-dr-tarssh.t b/tests/geo-rep/georep-basic-dr-tarssh.t index cb4b7c55532..ccf688c2701 100644 --- a/tests/geo-rep/georep-basic-dr-tarssh.t +++ b/tests/geo-rep/georep-basic-dr-tarssh.t @@ -68,25 +68,56 @@ TEST $GEOREP_CLI $master $slave start sleep 10 EXPECT 2 check_status_num_rows "Active" EXPECT 2 check_status_num_rows "Passive" #20 -TEST data_tests "hybrid" + +#DATA_TESTS HYBRID +sleep 10 +TEST regular_file_ok ${slave_mnt}/hybrid_f1 +TEST directory_ok ${slave_mnt}/$hybrid_d1 +TEST rename_ok ${slave_mnt}/hybrid_f3 ${slave_mnt}/hybrid_f4 +TEST rename_ok ${slave_mnt}/hybrid_d3 ${slave_mnt}/hybrid_d4 +TEST symlink_ok hybrid_f1 ${slave_mnt}/hybrid_sl1 #25 +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!" #Check History Crawl. -TEST $GEOREP_CLI $master $slave stop +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" #25 +EXPECT 2 check_status_num_rows "Active" EXPECT 2 check_status_num_rows "Passive" -TEST data_tests "history" +#data_tests "history" +sleep 10 +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 #40 +TEST unlink_ok ${slave_mnt}/history_f2 +TEST unlink_ok ${slave_mnt}/history_d2 +TEST data_ok ${slave_mnt}/history_f1 "HelloWorld!" #Check History Crawl. TEST create_data "changelog" sleep 15 -TEST check_status "Changelog Crawl" -TEST data_tests "changelog" #30 +TEST check_status "Changelog Crawl" #45 +#data_tests "changelog" +sleep 10 +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 symlink_ok changelog_f1 ${slave_mnt}/changelog_sl1 #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!" #Stop Geo-rep -TEST $GEOREP_CLI $master $slave stop +TEST $GEOREP_CLI $master $slave stop #55 #Delete Geo-rep TEST $GEOREP_CLI $master $slave delete |