duplicity-team team mailing list archive

[nils <nils@xxxxxxxxxxx>]

nils has proposed merging lp:~dernils/duplicity/fixedTestSetup into lp:duplicity.

Requested reviews:
  duplicity-team (duplicity-team)

For more details, see:
https://code.launchpad.net/~dernils/duplicity/fixedTestSetup/+merge/324621

Fixed the wrong name of a docker image in setup.sh
-- 
Your team duplicity-team is requested to review the proposed merge of lp:~dernils/duplicity/fixedTestSetup into lp:duplicity.

=== modified file 'testing/infrastructure/setup.sh'
--- testing/infrastructure/setup.sh	2017-05-21 19:45:56 +0000
+++ testing/infrastructure/setup.sh	2017-05-25 13:04:19 +0000
@@ -36,7 +36,7 @@
 # accidentially touch other containers
 
 echo "Removing any running instances of duplicity_test_*"
-docker rm -f $(docker ps  -a -q --filter name=duplicity_test_) &> /dev/null
+docker rm -f $(docker ps  -a -q --filter name=duplicitytest_) &> /dev/null
 
 echo "(Re)create docker testnetwork."
 docker network rm ${TESTNETWORK} &> /dev/null
@@ -57,4 +57,4 @@
 docker run --net ${TESTNETWORK} --ip ${IP_DUPLICITY_TEST} --name duplicity_test_main \
     -e DUPLICITY_TESTNETWORK=${TESTNETWORK} -e DUPLICITY_SUBNET=${SUBNET} -e "PUBLICHOST=localhost" \
     -e DUPLICITY_IP_SSH_SERVER=${IP_DUPLICITY_SSH} -e DUPLICITY_IP_FTP_SERVER=${IP_DUPLICITY_FTP} \
-    -it firstprime/duplicity_test:latest
+    -it firstprime/duplicitytest:latest