Duplicity

Merge lp:~dernils/duplicity/fixedTestSetup into lp:~duplicity-team/duplicity/0.8-series

  1. fixedTestSetup
  2. Merge into 0.8-series
Proposed by nils
Status: Rejected
Rejected by: Kenneth Loafman
Proposed branch: lp:~dernils/duplicity/fixedTestSetup
Merge into: lp:~duplicity-team/duplicity/0.8-series
Diff against target: 18 lines (+2/-2)
1 file modified
testing/infrastructure/setup.sh (+2/-2)
To merge this branch: bzr merge lp:~dernils/duplicity/fixedTestSetup
Reviewer Review Type Date Requested Status
duplicity-team Pending
Review via email: mp+324621@code.launchpad.net

Description of the change

Fixed the wrong name of a docker image in setup.sh

To post a comment you must log in.

Unmerged revisions

1233. By nils

fixed a minor thing in setup.sh

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'testing/infrastructure/setup.sh'
2--- testing/infrastructure/setup.sh 2017-05-21 19:45:56 +0000
3+++ testing/infrastructure/setup.sh 2017-05-25 13:04:19 +0000
4@@ -36,7 +36,7 @@
5 # accidentially touch other containers
6
7 echo "Removing any running instances of duplicity_test_*"
8-docker rm -f $(docker ps -a -q --filter name=duplicity_test_) &> /dev/null
9+docker rm -f $(docker ps -a -q --filter name=duplicitytest_) &> /dev/null
10
11 echo "(Re)create docker testnetwork."
12 docker network rm ${TESTNETWORK} &> /dev/null
13@@ -57,4 +57,4 @@
14 docker run --net ${TESTNETWORK} --ip ${IP_DUPLICITY_TEST} --name duplicity_test_main \
15 -e DUPLICITY_TESTNETWORK=${TESTNETWORK} -e DUPLICITY_SUBNET=${SUBNET} -e "PUBLICHOST=localhost" \
16 -e DUPLICITY_IP_SSH_SERVER=${IP_DUPLICITY_SSH} -e DUPLICITY_IP_FTP_SERVER=${IP_DUPLICITY_FTP} \
17- -it firstprime/duplicity_test:latest
18+ -it firstprime/duplicitytest:latest

Subscribers

People subscribed via source and target branches