From 950371be29d029179ac5cd0ad2dfdbfcd4467b96 Mon Sep 17 00:00:00 2001
From: Avra Sengupta <asengupt@redhat.com>
Date: Mon, 27 May 2013 22:23:57 +0530
Subject: move 'xlators/marker/utils/' to 'geo-replication/' directory

Change-Id: Ibd0faefecc15b6713eda28bc96794ae58aff45aa
BUG: 847839
Original Author: Amar Tumballi <amarts@redhat.com>
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-on: http://review.gluster.org/5133
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
---
 tests/bugs/bug-861945.t | 51 -------------------------------------------------
 tests/bugs/bug-864499.t | 20 -------------------
 tests/bugs/bug-864506.t | 33 --------------------------------
 tests/bugs/bug-874272.t | 48 ----------------------------------------------
 4 files changed, 152 deletions(-)
 delete mode 100755 tests/bugs/bug-861945.t
 delete mode 100644 tests/bugs/bug-864499.t
 delete mode 100755 tests/bugs/bug-864506.t
 delete mode 100755 tests/bugs/bug-874272.t

(limited to 'tests/bugs')

diff --git a/tests/bugs/bug-861945.t b/tests/bugs/bug-861945.t
deleted file mode 100755
index 29ccb33c..00000000
--- a/tests/bugs/bug-861945.t
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-function georep_start_and_check()
-{
-    local master=$1
-    local slave=$2
-
-    $CLI volume geo-replication $master $slave start
-}
-
-function georep_stop()
-{
-    local master=$1
-    local slave=$2
-
-    $CLI volume geo-replication $master $slave stop
-}
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 $H0:$B0/brick0 $H0:$B0/brick1
-TEST $CLI volume start $V0
-
-sleep 5
-
-slave=`mktemp -d`
-mkdir -p $slave
-
-# check normal functionality of geo-replication
-EXPECT_KEYWORD "successful" georep_start_and_check $V0 $slave
-TEST georep_stop $V0 $slave
-
-# now invoke replace brick
-TEST $CLI volume replace-brick $V0 $H0:$B0/brick1 $H0:$B0/brick2 start
-
-# check if CLI refuses to start geo replication
-EXPECT_KEYWORD "failed" georep_start_and_check $V0 $slave
-
-# commit replace brick operation
-TEST $CLI volume replace-brick $V0 $H0:$B0/brick1 $H0:$B0/brick2 commit
-
-# geo replication should work as usual
-EXPECT_KEYWORD "successful" georep_start_and_check $V0 $slave
-TEST georep_stop $V0 $slave
-
-rm -rf $slave
-cleanup
diff --git a/tests/bugs/bug-864499.t b/tests/bugs/bug-864499.t
deleted file mode 100644
index 03c7bbe1..00000000
--- a/tests/bugs/bug-864499.t
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 $H0:$B0/brick0
-TEST $CLI volume start $V0
-
-TEST "$CLI volume geo-replication $V0 $B0/slave start --xml | xmllint --format -"
-
-TEST "$CLI volume geo-replication $V0 $B0/slave stop --xml | xmllint --format -"
-
-TEST $CLI volume stop $V0
-
-cleanup;
-
diff --git a/tests/bugs/bug-864506.t b/tests/bugs/bug-864506.t
deleted file mode 100755
index c281f381..00000000
--- a/tests/bugs/bug-864506.t
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 $H0:$B0/brick0
-TEST $CLI volume start $V0
-
-TEST "mkdir $B0/slave"
-
-TEST "$CLI volume geo-replication $V0 $B0/slave start --xml | xmllint --format -"
-
-TEST "$CLI volume geo-replication $V0 $B0/slave2 start --xml | xmllint --format -"
-
-TEST "$CLI volume geo-replication status --xml | xmllint --format -"
-
-TEST "$CLI volume geo-replication $V0 $B0/slave status --xml | xmllint --format -"
-
-TEST "$CLI volume geo-replication $V0 $B0/slave2 status --xml | xmllint --format -"
-
-TEST "$CLI volume geo-replication $V0 $B0/slave stop --xml | xmllint --format -"
-
-TEST "$CLI volume geo-replication $V0 $B0/slave2 stop --xml | xmllint --format -"
-
-TEST $CLI volume stop $V0
-
-TEST "rmdir $B0/slave"
-
-cleanup;
diff --git a/tests/bugs/bug-874272.t b/tests/bugs/bug-874272.t
deleted file mode 100755
index 01793a36..00000000
--- a/tests/bugs/bug-874272.t
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-function volinfo_field()
-{
-    local vol=$1;
-    local field=$2;
-
-    $CLI volume info $vol | grep "^$field: " | sed 's/.*: //';
-}
-
-TEST $CLI volume create $V0 $H0:$B0/brick1;
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Wait for volume to register with rpc.mountd
-sleep 5;
-
-#mount on a random dir
-TEST MOUNTDIR="/tmp/$RANDOM"
-TEST mkdir $MOUNTDIR
-TEST  mount -t nfs -o vers=3,nolock,soft,intr $H0:/$V0 $MOUNTDIR;
-flag=0
-
-TEST touch $MOUNTDIR/testfile
-
-TEST GEOREPDIR="/tmp/$RANDOM"
-TEST mkdir $GEOREPDIR
-
-TEST $CLI volume geo-replication $V0 file:///$GEOREPDIR start
-
-for i in {1..500}; do cat /etc/passwd >> $MOUNTDIR/testfile; if [ $? -ne 0 ]; then flag=1; break; fi; done
-TEST [ $flag -eq 0 ]
-TEST rm -rf $GEOREPDIR
-
-TEST   umount $MOUNTDIR
-TEST   rm -rf $MOUNTDIR
-
-cleanup;
-- 
cgit