summaryrefslogtreecommitdiffstats
path: root/tests/basic
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2014-04-28 14:18:50 +0000
committerJeff Darcy <jdarcy@redhat.com>2014-04-28 14:18:50 +0000
commite139b4d0ba2286c0d4d44ba81260c2b287016019 (patch)
tree0a21f0761528e0f79da0a9f67106eb128ace0cf7 /tests/basic
parent73b60c87ca7f62517a8466431f5a8cf167589c8c (diff)
parentf2bac9f9d5b9956969ddd25a54bc636b82f6923e (diff)
Merge branch 'upstream'HEADmaster
Conflicts: rpc/xdr/src/glusterfs3-xdr.c rpc/xdr/src/glusterfs3-xdr.h xlators/features/changelog/src/Makefile.am xlators/features/changelog/src/changelog-helpers.h xlators/features/changelog/src/changelog.c xlators/mgmt/glusterd/src/glusterd-sm.c Change-Id: I9972a5e6184503477eb77a8b56c50a4db4eec3e2
Diffstat (limited to 'tests/basic')
-rw-r--r--tests/basic/pgfid-feat.t3
-rwxr-xr-xtests/basic/volume-snapshot.t3
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/basic/pgfid-feat.t b/tests/basic/pgfid-feat.t
index 8784cc7..3978f9c 100644
--- a/tests/basic/pgfid-feat.t
+++ b/tests/basic/pgfid-feat.t
@@ -24,11 +24,10 @@ TEST $CLI volume set $V0 build-pgfid on;
TEST mkdir $M0/a;
TEST touch $M0/a/b;
-getfattr -e text -n glusterfs.ancestry.path "$M0/a/b" | grep "^glusterfs.ancestry.path" | cut -d"=" -f2 | tr -d \";
EXPECT "/a/b" get_ancestry_path "/a/b";
TEST $CLI volume set $V0 build-pgfid off;
-TEST ! getfattr -e text -n "glusterfs.ancestry.path" $M0/a/b;
+EXPECT "" get_ancestry_path "/a/b";
TEST $CLI volume stop $V0;
TEST $CLI volume delete $V0;
diff --git a/tests/basic/volume-snapshot.t b/tests/basic/volume-snapshot.t
index c826631..e6c47f0 100755
--- a/tests/basic/volume-snapshot.t
+++ b/tests/basic/volume-snapshot.t
@@ -5,6 +5,7 @@
. $(dirname $0)/../cluster.rc
. $(dirname $0)/../snapshot.rc
+
V1="patchy2"
function create_volumes() {
@@ -48,6 +49,7 @@ function restore_snapshots() {
}
cleanup;
+TEST verify_lvm_version;
#Create cluster with 3 nodes
TEST launch_cluster 3;
TEST setup_lvm 3
@@ -92,4 +94,3 @@ TEST ! volume_exists $V0
TEST ! volume_exists $V1
cleanup;
-