diff options
| author | vmallika <vmallika@redhat.com> | 2016-02-09 18:11:24 +0530 |
|---|---|---|
| committer | Rajesh Joseph <rjoseph@redhat.com> | 2016-02-15 00:20:39 -0800 |
| commit | fa3df1f5eaf3104c0eb597b954dd17b1a067db8c (patch) | |
| tree | dbc5458abfba05d2e40e8473acdb273414df4d03 /tests | |
| parent | 87faa0d763e1c416f12becc84b4c62cf6d545d1d (diff) | |
uss: validate USS option features.snapshot-directory
This is a backport of http://review.gluster.org/#/c/9209
USS option features.snapshot-directory
contains only 'alphanum, -, _, .'
starts with dot (.)
value cannot exceed 255 characters
and throws error for any other argument.
> Change-Id: Iad64635206ddf5599351020d99aafb3dd9d17bc1
> BUG: 1168819
> Signed-off-by: vmallika <vmallika@redhat.com>
> Reviewed-on: http://review.gluster.org/9209
> Smoke: Gluster Build System <jenkins@build.gluster.com>
> Reviewed-by: Avra Sengupta <asengupt@redhat.com>
> Reviewed-by: Manikandan Selvaganesh <mselvaga@redhat.com>
> Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Change-Id: I1b85d6851a223b51714c0498b457c41db99f5f58
BUG: 1305868
Signed-off-by: vmallika <vmallika@redhat.com>
Reviewed-on: http://review.gluster.org/13409
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/basic/uss.t | 12 | ||||
| -rw-r--r-- | tests/bugs/snapshot/bug-1164613.t | 34 |
2 files changed, 12 insertions, 34 deletions
diff --git a/tests/basic/uss.t b/tests/basic/uss.t index 60fcadffd2e..7a4f043d260 100644 --- a/tests/basic/uss.t +++ b/tests/basic/uss.t @@ -68,6 +68,18 @@ for i in {1..10}; do TEST_IN_LOOP ! $CLI volume set $V0 features.uss $RANDOM_STRING done +## Test that features.snapshot-directory: +## contains only '0-9a-z-_' +# starts with dot (.) +# value cannot exceed 255 characters +## and throws error for any other argument. +TEST ! $CLI volume set $V0 features.snapshot-directory a/b +TEST ! $CLI volume set $V0 features.snapshot-directory snaps +TEST ! $CLI volume set $V0 features.snapshot-directory -a +TEST ! $CLI volume set $V0 features.snapshot-directory . +TEST ! $CLI volume set $V0 features.snapshot-directory .. +TEST ! $CLI volume set $V0 features.snapshot-directory .123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345 + TEST $CLI volume set $V0 features.uss enable; EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0 diff --git a/tests/bugs/snapshot/bug-1164613.t b/tests/bugs/snapshot/bug-1164613.t deleted file mode 100644 index d7f956ce369..00000000000 --- a/tests/bugs/snapshot/bug-1164613.t +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -. $(dirname $0)/../../include.rc -. $(dirname $0)/../../snapshot.rc - -cleanup; -TEST verify_lvm_version; -TEST glusterd; -TEST pidof glusterd; - -TEST setup_lvm 1 - -TEST $CLI volume create $V0 $H0:$L1 -TEST $CLI volume start $V0 -TEST glusterfs -s $H0 --volfile-id=$V0 $M0 - -TEST touch $M0/testfile - -TEST $CLI snapshot create snaps $V0 no-timestamp -TEST $CLI snapshot activate snaps -TEST $CLI volume set $V0 features.uss enable -TEST $CLI volume set $V0 snapshot-directory snaps - -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" STAT $M0/snaps/snaps/testfile - -umount -f $M0 - -#Clean up -TEST $CLI snapshot delete snaps -TEST $CLI volume stop $V0 force -TEST $CLI volume delete $V0 - -cleanup; - |