summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKotresh HR <khiremat@redhat.com>2015-09-01 11:24:09 +0530
committerJeff Darcy <jdarcy@redhat.com>2015-09-01 05:59:43 -0700
commit2a568e0c0fd3f23a94cc87bf4c0bd07aaa65d5a5 (patch)
treecac3d8d5e3d93c231bff3aa542c8cb539c7d2db8
parent7b390983768e833a8df15b994038155c53d71bdd (diff)
tests: Remove geo-rep tests from bad tests
Remove 'tests/geo-rep/georep-basic-dr-rsync.t' and 'tests/geo-rep/georep-basic-dr-tarssh.t' from bad tests as it passes on linux machines. It is disabled only in NetBSD untill portability issues are fixed. (https://bugzilla.redhat.com/show_bug.cgi?id=1257847) Also add increase sleep timining to let the data sync. Change-Id: Ifc831353a345bcf5605fc4dfba693df891bb6d5b BUG: 1227624 Signed-off-by: Kotresh HR <khiremat@redhat.com> Reviewed-on: http://review.gluster.org/12072 Reviewed-by: Raghavendra Talur <rtalur@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Tested-by: NetBSD Build System <jenkins@build.gluster.org>
-rwxr-xr-xrun-tests.sh2
-rw-r--r--tests/geo-rep/georep-basic-dr-rsync.t6
-rw-r--r--tests/geo-rep/georep-basic-dr-tarssh.t8
3 files changed, 8 insertions, 8 deletions
diff --git a/run-tests.sh b/run-tests.sh
index 5d657945850..dc3dd8aec8b 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -198,8 +198,6 @@ function is_bad_test ()
./tests/basic/tier/bug-1214222-directories_miising_after_attach_tier.t \
./tests/bugs/snapshot/bug-1109889.t \
./tests/bugs/distribute/bug-1066798.t \
- ./tests/geo-rep/georep-basic-dr-rsync.t \
- ./tests/geo-rep/georep-basic-dr-tarssh.t \
./tests/basic/afr/arbiter-statfs.t \
./tests/basic/tier/tier.t \
./tests/bugs/glusterd/bug-1238706-daemons-stop-on-peer-cleanup.t \
diff --git a/tests/geo-rep/georep-basic-dr-rsync.t b/tests/geo-rep/georep-basic-dr-rsync.t
index 4c1885b78b2..bcb31d90c9e 100644
--- a/tests/geo-rep/georep-basic-dr-rsync.t
+++ b/tests/geo-rep/georep-basic-dr-rsync.t
@@ -65,7 +65,7 @@ EXPECT 2 check_status_num_rows "Active"
EXPECT 2 check_status_num_rows "Passive"
#DATA_TESTS HYBRID
-sleep 10
+sleep 15
TEST regular_file_ok ${slave_mnt}/hybrid_f1 #20
TEST directory_ok ${slave_mnt}/$hybrid_d1
TEST rename_ok ${slave_mnt}/hybrid_f3 ${slave_mnt}/hybrid_f4
@@ -88,7 +88,7 @@ EXPECT 2 check_status_num_rows "Passive"
#data_tests "history"
-sleep 10
+sleep 15
TEST regular_file_ok ${slave_mnt}/history_f1
TEST directory_ok ${slave_mnt}/history_d1 #35
TEST rename_ok ${slave_mnt}/history_f3 ${slave_mnt}/history_f4
@@ -105,7 +105,7 @@ sleep 15
TEST check_status "Changelog Crawl"
#data_tests "changelog"
-sleep 10
+sleep 15
TEST regular_file_ok ${slave_mnt}/changelog_f1 #45
TEST directory_ok ${slave_mnt}/changelog_d1
TEST rename_ok ${slave_mnt}/changelog_f3 ${slave_mnt}/changelog_f4
diff --git a/tests/geo-rep/georep-basic-dr-tarssh.t b/tests/geo-rep/georep-basic-dr-tarssh.t
index ccf688c2701..2985b2e5de0 100644
--- a/tests/geo-rep/georep-basic-dr-tarssh.t
+++ b/tests/geo-rep/georep-basic-dr-tarssh.t
@@ -70,7 +70,7 @@ EXPECT 2 check_status_num_rows "Active"
EXPECT 2 check_status_num_rows "Passive" #20
#DATA_TESTS HYBRID
-sleep 10
+sleep 15
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
@@ -88,8 +88,9 @@ TEST $GEOREP_CLI $master $slave start
sleep 10
EXPECT 2 check_status_num_rows "Active"
EXPECT 2 check_status_num_rows "Passive"
+
#data_tests "history"
-sleep 10
+sleep 15
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
@@ -104,8 +105,9 @@ TEST data_ok ${slave_mnt}/history_f1 "HelloWorld!"
TEST create_data "changelog"
sleep 15
TEST check_status "Changelog Crawl" #45
+
#data_tests "changelog"
-sleep 10
+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