diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-04-28 14:18:50 +0000 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2014-04-28 14:18:50 +0000 |
| commit | e139b4d0ba2286c0d4d44ba81260c2b287016019 (patch) | |
| tree | 0a21f0761528e0f79da0a9f67106eb128ace0cf7 /tests/basic | |
| parent | 73b60c87ca7f62517a8466431f5a8cf167589c8c (diff) | |
| parent | f2bac9f9d5b9956969ddd25a54bc636b82f6923e (diff) | |
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.t | 3 | ||||
| -rwxr-xr-x | tests/basic/volume-snapshot.t | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/basic/pgfid-feat.t b/tests/basic/pgfid-feat.t index 8784cc7bf..3978f9c97 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 c826631ca..e6c47f0d5 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; - |