summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorVijaikumar M <vmallika@redhat.com>2014-02-14 20:01:38 +0530
committerRajesh Joseph <rjoseph@redhat.com>2014-03-03 22:58:23 -0800
commitfe5927b6bd1ed795c9e85996e7c54c3abe36ceba (patch)
treed69e25c323a4b57c49af8555db75ff65c9690701 /tests
parent60d4f64cea4752f76b9495bdea255b51d09820ff (diff)
glusterd/snapshot: store location for snap driven changes
Currently snapshot volfiles are stored at: <workdir>/vols/<volname>/snaps/<snapvol> With snap driven approach we need to store the volfiles at: <workdir>/snaps/<snapname>/<snapvol> Change-Id: I8efdd5db29833b2b06b64a900cbb4c9b9a5d36b6 Signed-off-by: Vijaikumar M <vmallika@redhat.com> Signed-off-by: Sachin Pandit <spandit@redhat.com> Reviewed-on: http://review.gluster.org/7006 Reviewed-by: Avra Sengupta <asengupt@redhat.com> Reviewed-by: Rajesh Joseph <rjoseph@redhat.com> Tested-by: Rajesh Joseph <rjoseph@redhat.com>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/basic/volume-snapshot.t4
-rw-r--r--tests/bugs/bug-1040934.t2
-rw-r--r--tests/bugs/bug-1045333.t6
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/basic/volume-snapshot.t b/tests/basic/volume-snapshot.t
index bb7dcb458..f6b88068e 100755
--- a/tests/basic/volume-snapshot.t
+++ b/tests/basic/volume-snapshot.t
@@ -62,9 +62,9 @@ TEST snapshot_exists ${V1}_snap
TEST $CLI_1 snapshot config $V0 snap-max-hard-limit 100
TEST $CLI_1 snapshot config $V1 snap-max-hard-limit 100
-TEST mount -t glusterfs $H1:/$V0/snaps/${V0}_snap $M0
+TEST mount -t glusterfs $H1:/snaps/${V0}_snap/${V0} $M0
TEST umount -f $M0
-TEST mount -t glusterfs $H2:/$V1/snaps/${V1}_snap $M0
+TEST mount -t glusterfs $H2:/snaps/${V1}_snap/${V1} $M0
TEST umount -f $M0
#Clean up
diff --git a/tests/bugs/bug-1040934.t b/tests/bugs/bug-1040934.t
index 38ccc1120..547f6c3bc 100644
--- a/tests/bugs/bug-1040934.t
+++ b/tests/bugs/bug-1040934.t
@@ -24,7 +24,7 @@ PID_1=$!
wait $PID_1
TEST snapshot_exists ${V0}_snap
-TEST mount -t glusterfs $H1:$V0/snaps/${V0}_snap $M0
+TEST mount -t glusterfs $H1:/snaps/${V0}_snap/$V0 $M0
cd $M0
TEST ! touch a
diff --git a/tests/bugs/bug-1045333.t b/tests/bugs/bug-1045333.t
index 5abdd5558..c1fd71beb 100644
--- a/tests/bugs/bug-1045333.t
+++ b/tests/bugs/bug-1045333.t
@@ -28,13 +28,13 @@ TEST $CLI snapshot create $V0 -n $S3
TEST snapshot_exists $S3
-TEST mount -t glusterfs $H0:/$V0/snaps/$S1 $M0
+TEST mount -t glusterfs $H0:/snaps/$S1/$V0 $M0
TEST umount -f $M0
-TEST mount -t glusterfs $H0:/$V0/snaps/$S2 $M0
+TEST mount -t glusterfs $H0:/snaps/$S2/$V0 $M0
TEST umount -f $M0
-TEST mount -t glusterfs $H0:/$V0/snaps/$S3 $M0
+TEST mount -t glusterfs $H0:/snaps/$S3/$V0 $M0
TEST umount -f $M0
#Clean up