diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-04-01 12:28:56 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-04-01 12:28:56 +0200 |
| commit | be20eef52da4b7f361333ea70a8d705a98ae779e (patch) | |
| tree | 4177a110ce6b1335fc4b85d5e53b298a65661f39 /test/integration/test-apt-get-changelog | |
| parent | a555cf8be53d8b5557f004ecbde8482a169b79f3 (diff) | |
| parent | 21b3eac8f9ab8e12b43fa8998a5aa5465f29adc5 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into feature/apt-manpage
Conflicts:
cmdline/apt.cc
Diffstat (limited to 'test/integration/test-apt-get-changelog')
| -rwxr-xr-x | test/integration/test-apt-get-changelog | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/integration/test-apt-get-changelog b/test/integration/test-apt-get-changelog index d013cc458..a73c3e249 100755 --- a/test/integration/test-apt-get-changelog +++ b/test/integration/test-apt-get-changelog @@ -9,11 +9,11 @@ configarchitecture "i386" buildsimplenativepackage 'apt' 'all' '1.0' 'stable' -setupaptarchive +setupaptarchive --no-update changetowebserver -aptget update -qq +testsuccess aptget update -echo 'Apt::Changelogs::Server "http://localhost:8080/";' >> ./aptconfig.conf +echo 'Apt::Changelogs::Server "http://localhost:8080/";' > rootdir/etc/apt/apt.conf.d/changelog.conf testequal "'http://localhost:8080//pool/apt_1.0/changelog'" aptget changelog apt --print-uris @@ -24,7 +24,7 @@ aptget changelog apt -qq > apt.changelog testfileequal 'apt.changelog' "$(cat aptarchive/pool/apt_1.0/changelog)" rm apt.changelog -aptget changelog apt -d -qq +testsuccess aptget changelog apt -d testfileequal 'apt.changelog' "$(cat aptarchive/pool/apt_1.0/changelog)" rm apt.changelog aptarchive/pool/apt_1.0/changelog @@ -32,7 +32,7 @@ aptget changelog apt -qq -o APT::Changelogs::Server='http://not-on-the-main-serv testfileequal 'apt.changelog' "$(cat aptarchive/pool/apt_1.0.changelog)" rm apt.changelog -aptget changelog apt -d -qq +testsuccess aptget changelog apt -d testfileequal 'apt.changelog' "$(cat aptarchive/pool/apt_1.0.changelog)" rm apt.changelog aptarchive/pool/apt_1.0.changelog |