Update autopkgtests

 * borg requires a writeable $HOME, give it one below $AUTOPKGTEST_TMP
 * The repository is now communicated via an environment variable
 * init -> rcreate
 * list (without arguments) -> rlist

2 files changed, 33 insertions, 29 deletions

diff --git a/debian/tests/simplesession b/debian/tests/simplesession
index c6604404..dd21d789 100755
--- a/debian/tests/simplesession
+++ b/debian/tests/simplesession
@@ -3,8 +3,10 @@
 #Fail on error
 set -e
 
+export HOME=$AUTOPKGTEST_TMP/home
+mkdir "$HOME"
 DATA=$AUTOPKGTEST_TMP/data
-REPO=$AUTOPKGTEST_TMP/borgrepo
+export BORG_REPO=$AUTOPKGTEST_TMP/borgrepo
 MOUNT=$AUTOPKGTEST_TMP/mnt
 
 cd $AUTOPKGTEST_TMP
@@ -16,42 +18,42 @@ echo "Creating source data dir and mountpoint"
 mkdir $DATA
 mkdir $MOUNT
 
-echo "Calling borg init"
-borg init --encryption none $REPO
+echo "Calling borg rcreate"
+borg rcreate --encryption none
 
 # create source data
 
-echo "Creating $REPO::runone"
+echo "Creating runone"
 echo Hello, world > $DATA/file1
-borg create $REPO::runone data/
+borg create runone data/
 
-echo "Creating $REPO::runtwo"
+echo "Creating runtwo"
 echo Hello again > $DATA/file2
-borg create $REPO::runtwo data/
+borg create runtwo data/
 
 echo "Listing archives"
-borg list $REPO
+borg rlist
 
 echo "Listing runone and runtwo contents"
-borg list $REPO::runone
-borg list $REPO::runtwo
+borg list runone
+borg list runtwo
 
 echo "Testing borg extract --stdout"
-borg extract --stdout $REPO::runtwo data/file1 | grep -q "world"
-borg extract --stdout $REPO::runtwo data/file2 | grep -q "again"
+borg extract --stdout runtwo data/file1 | grep -q "world"
+borg extract --stdout runtwo data/file2 | grep -q "again"
 
-echo "Mounting $REPO::runtwo via fuse"
-borg mount $REPO::runtwo $MOUNT
+echo "Mounting runtwo via fuse"
+borg mount runtwo $MOUNT
 
 echo "Checking file contents in the fuse mount"
 cmp $DATA/file1 $MOUNT/data/file1
 cmp $DATA/file2 $MOUNT/data/file2
 
-echo "Unmounting $REPO::runtwo"
+echo "Unmounting runtwo"
 fusermount -u $MOUNT
 
-echo "Mounting $REPO::runone via fuse"
-borg mount $REPO::runone $MOUNT
+echo "Mounting runone via fuse"
+borg mount runone $MOUNT
 
 echo "Checking file contents"
 cmp $DATA/file1 $MOUNT/data/file1
diff --git a/debian/tests/simplesession-nofuse b/debian/tests/simplesession-nofuse
index 356a3d5a..b8ec2ffc 100755
--- a/debian/tests/simplesession-nofuse
+++ b/debian/tests/simplesession-nofuse
@@ -3,8 +3,10 @@
 #Fail on error
 set -e
 
+export HOME=$AUTOPKGTEST_TMP/home
+mkdir "$HOME"
 DATA=$AUTOPKGTEST_TMP/data
-REPO=$AUTOPKGTEST_TMP/borgrepo
+export BORG_REPO=$AUTOPKGTEST_TMP/borgrepo
 
 cd $AUTOPKGTEST_TMP
 
@@ -14,28 +16,28 @@ borg --version
 echo "Creating source data dir and mountpoint"
 mkdir $DATA
 
-echo "Calling borg init"
-borg init --encryption none $REPO
+echo "Calling borg rcreate"
+borg rcreate --encryption none
 
 # create source data
 
-echo "Creating $REPO::runone"
+echo "Creating runone"
 echo Hello, world > $DATA/file1
-borg create $REPO::runone data/
+borg create runone data/
 
-echo "Creating $REPO::runtwo"
+echo "Creating runtwo"
 echo Hello again > $DATA/file2
-borg create $REPO::runtwo data/
+borg create runtwo data/
 
 echo "Listing archives"
-borg list $REPO
+borg rlist
 
 echo "Listing runone and runtwo contents"
-borg list $REPO::runone
-borg list $REPO::runtwo
+borg list runone
+borg list runtwo
 
 echo "Testing borg extract --stdout"
-borg extract --stdout $REPO::runtwo data/file1 | grep -q "world"
-borg extract --stdout $REPO::runtwo data/file2 | grep -q "again"
+borg extract --stdout runtwo data/file1 | grep -q "world"
+borg extract --stdout runtwo data/file2 | grep -q "again"
 
 echo "All good!"