diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/bugs/snapshot/bug-1140162-file-snapshot-features-encrypt-opts-validation.t | 8 | ||||
| -rwxr-xr-x | tests/encryption/crypt.t | 14 |
2 files changed, 15 insertions, 7 deletions
diff --git a/tests/bugs/snapshot/bug-1140162-file-snapshot-features-encrypt-opts-validation.t b/tests/bugs/snapshot/bug-1140162-file-snapshot-features-encrypt-opts-validation.t index f91093db4e7..b9f6dc715e6 100644 --- a/tests/bugs/snapshot/bug-1140162-file-snapshot-features-encrypt-opts-validation.t +++ b/tests/bugs/snapshot/bug-1140162-file-snapshot-features-encrypt-opts-validation.t @@ -28,6 +28,14 @@ TEST $CLI volume set $V0 ping-timeout 60 ## Set features.file-snapshot and features.encryption option with valid boolean ## value. These options should succeed. TEST $CLI volume set $V0 features.file-snapshot on + +## Before setting the crypt xlator on, it is required to create master key +## Otherwise glusterfs client process will fail to start +echo "0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff" > $GLUSTERD_WORKDIR/$V0-master-key + +## Specify location of master key +TEST $CLI volume set $V0 encryption.master-key $GLUSTERD_WORKDIR/$V0-master-key + TEST $CLI volume set $V0 features.encryption on cleanup; diff --git a/tests/encryption/crypt.t b/tests/encryption/crypt.t index efd8852e2ec..8781db3478b 100755 --- a/tests/encryption/crypt.t +++ b/tests/encryption/crypt.t @@ -23,16 +23,16 @@ EXPECT 'off' volinfo_field $V0 'performance.write-behind' TEST $CLI volume set $V0 performance.open-behind off EXPECT 'off' volinfo_field $V0 'performance.open-behind' -## Turn on crypt xlator by setting features.encryption to on -TEST $CLI volume set $V0 encryption on -EXPECT 'on' volinfo_field $V0 'features.encryption' +## Create a file with master key -## Specify location of master key -TEST $CLI volume set $V0 encryption.master-key /tmp/$V0-master-key +echo "0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff" > $GLUSTERD_WORKDIR/$V0-master-key -## Create a file with master key +## Specify location of master key +TEST $CLI volume set $V0 encryption.master-key $GLUSTERD_WORKDIR/$V0-master-key -echo "0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff" > /tmp/$V0-master-key +## Turn on crypt xlator by setting features.encryption to on +TEST $CLI volume set $V0 encryption on +EXPECT 'on' volinfo_field $V0 'features.encryption' ## Start the volume TEST $CLI volume start $V0; |