diff options
author | Lars Wirzenius <liw@liw.fi> | 2014-01-12 21:37:58 +0000 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2014-01-12 21:37:58 +0000 |
commit | 08ae580744cb32e16bdfdc69fa16f8f231c56fea (patch) | |
tree | 5e261819ba0ef70b38b5061a60c941587a49d8c3 | |
parent | b0faaff4d324c5062744230059899ab01b081747 (diff) | |
download | obnam-08ae580744cb32e16bdfdc69fa16f8f231c56fea.tar.gz |
Fix test suite failure
Depending on how the encrypted data is, the error message, when
accessing an encrypted repository without encryption enabled, may be
different. Deal with it.
-rw-r--r-- | test-gpghome/random_seed | bin | 600 -> 600 bytes | |||
-rw-r--r-- | yarns/0060-encryption.yarn | 2 | ||||
-rw-r--r-- | yarns/obnam.sh | 5 |
3 files changed, 6 insertions, 1 deletions
diff --git a/test-gpghome/random_seed b/test-gpghome/random_seed Binary files differindex f368c565..719c2974 100644 --- a/test-gpghome/random_seed +++ b/test-gpghome/random_seed diff --git a/yarns/0060-encryption.yarn b/yarns/0060-encryption.yarn index fd002b03..8f7d9b8e 100644 --- a/yarns/0060-encryption.yarn +++ b/yarns/0060-encryption.yarn @@ -99,7 +99,7 @@ client, should not be able to access the data. GIVEN a user U3 calling themselves U1 WHEN user U3 attempts to restore their latest generation in repository R into X3 THEN the attempt failed with exit code 1 - AND the error message matches "need more than 1 value to unpack" + AND the error message matches "Unknown filter tag encountered\|need more than 1 value to unpack" (The error message above indicates that there's a bug in Obnam, which is that the error message, when an encryption is not provided but the diff --git a/yarns/obnam.sh b/yarns/obnam.sh index 727ecd76..75258415 100644 --- a/yarns/obnam.sh +++ b/yarns/obnam.sh @@ -34,6 +34,11 @@ run_obnam() add_to_config "$name" client-name "$name" fi + # Always turn off weak-random, or else anything that uses + # encryption will take a long time. We don't need strong random + # numbers for tests. + add_to_config "$name" weak-random yes + ( if [ -e "$DATADIR/$name.env" ] then |