diff options
| author | Michael Vogt <mvo@debian.org> | 2014-02-23 00:45:56 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-02-23 00:45:56 +0100 |
| commit | eccff323a093d91fff379e7c8460d7e5c8db8ad1 (patch) | |
| tree | d539d21c6716af3122edabae91feadccfb3c12ad /test/integration/test-ubuntu-bug-346386-apt-get-update-paywall | |
| parent | 2c678b0a026ac9d44c8ade07aa8bf318faf5a9e2 (diff) | |
| parent | b7ed961b8099c05f65e18d4c73ead50cc5c8bff1 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
Diffstat (limited to 'test/integration/test-ubuntu-bug-346386-apt-get-update-paywall')
| -rwxr-xr-x | test/integration/test-ubuntu-bug-346386-apt-get-update-paywall | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall index 1576c396c..7112d2b45 100755 --- a/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall +++ b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall @@ -22,7 +22,7 @@ Config-Item: Acquire::http::DependOnSTDIN=0 600 Acquire URI URI: http://localhost:8080/holygrail Filename: knights-talking -' | http >/dev/null 2>&1 && msgpass || msgfail +' | ${METHODSDIR}/http >/dev/null 2>&1 && msgpass || msgfail testfileequal knights-talking 'ni ni ni' ensure_n_canary_strings_in_dir() { |