summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2014-02-19 21:27:16 +0000
committerLars Wirzenius <liw@liw.fi>2014-02-19 21:27:16 +0000
commit67741f6f3b68d1b8ed9a5424bb0ef8f8577827ec (patch)
treee7c9dfa9f69ed870cf9d9758458a85f27884220c
parent070d82a5b4f19926c5820cf0c451c3beefc56607 (diff)
downloadobnam-67741f6f3b68d1b8ed9a5424bb0ef8f8577827ec.tar.gz
Convert compression+encryption.script to yarn
-rwxr-xr-xtests/compression+encryption.script23
-rw-r--r--yarns/0070-compression.yarn13
2 files changed, 13 insertions, 23 deletions
diff --git a/tests/compression+encryption.script b/tests/compression+encryption.script
deleted file mode 100755
index 4cca7cce..00000000
--- a/tests/compression+encryption.script
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# Copyright 2011 Lars Wirzenius
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-set -e
-
-gpgkey='3B1802F81B321347'
-$SRCDIR/tests/backup --encrypt-with="$gpgkey" --compress-with=gzip
-$SRCDIR/tests/restore --encrypt-with="$gpgkey" --compress-with=gzip
-$SRCDIR/tests/verify
-
diff --git a/yarns/0070-compression.yarn b/yarns/0070-compression.yarn
index bf7976ee..df301774 100644
--- a/yarns/0070-compression.yarn
+++ b/yarns/0070-compression.yarn
@@ -27,3 +27,16 @@ accordingly.
WHEN user U restores their latest generation in repository R into Y
THEN L, restored to Y, matches manifest M
AND user U can fsck the repository R
+
+We need to be able to combine compression with encryption. Let's do
+the test again, with new options.
+
+ SCENARIO backup simple data using compression and encryption
+ GIVEN 100kB of new data in directory L
+ AND a manifest of L in M
+ AND user U sets configuration compress-with to deflate
+ GIVEN user U uses encryption key "Test Key One" from test-data/keyring-1
+ WHEN user U backs up directory L to repository R
+ AND user U restores their latest generation in repository R into X
+ THEN L, restored to X, matches manifest M
+ AND user U can fsck the repository R