From f02e03374f43ee541a711ff79fd5a4815e55eea5 Mon Sep 17 00:00:00 2001 From: Raghavendra Talur Date: Thu, 10 Mar 2016 18:01:33 +0530 Subject: tests: Backport all changes to tests dir Test framework should be the same on all the branches. This is a copy of all the files under tests dir from master branch. New tests in master have not been backported, but changes to existing tests have been. Change-Id: I75747c525aabbd9247473dd29b3a0e7a7d93c827 BUG: 1316533 Signed-off-by: Raghavendra Talur Reviewed-on: http://review.gluster.org/13683 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System --- tests/bugs/replicate/bug-1221481-allow-fops-on-dir-split-brain.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/bugs/replicate') diff --git a/tests/bugs/replicate/bug-1221481-allow-fops-on-dir-split-brain.t b/tests/bugs/replicate/bug-1221481-allow-fops-on-dir-split-brain.t index 1283d8eeef4..c4752c488f4 100644 --- a/tests/bugs/replicate/bug-1221481-allow-fops-on-dir-split-brain.t +++ b/tests/bugs/replicate/bug-1221481-allow-fops-on-dir-split-brain.t @@ -30,5 +30,5 @@ EXPECT "6" echo $(ls | wc -l) TEST ! cat FILE TEST `echo hello>hello.txt` cd - -TEST umount $M0 +EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0 cleanup -- cgit