diff options
| author | Michael Vogt <mvo@debian.org> | 2013-08-15 09:26:00 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-08-15 09:26:00 +0200 |
| commit | d7a4635391d9ff36152603ab6faa6eafa206750a (patch) | |
| tree | e16a562e3e9a195cae286433c5751a1ab9990635 /test/libapt | |
| parent | 2a49601f69e08f06fb2727d869d420daacdd09d5 (diff) | |
| parent | 183116d1a64a2610b88fa6b50f2c5199b69d5841 (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-pkg/contrib/strutl.cc
apt-pkg/deb/dpkgpm.cc
configure.ac
debian/changelog
doc/po/apt-doc.pot
po/apt-all.pot
po/ar.po
po/ast.po
po/bg.po
po/bs.po
po/ca.po
po/cs.po
po/cy.po
po/da.po
po/de.po
po/dz.po
po/el.po
po/es.po
po/eu.po
po/fi.po
po/fr.po
po/gl.po
po/hu.po
po/it.po
po/ja.po
po/km.po
po/ko.po
po/ku.po
po/lt.po
po/mr.po
po/nb.po
po/ne.po
po/nl.po
po/nn.po
po/pl.po
po/pt.po
po/pt_BR.po
po/ro.po
po/ru.po
po/sk.po
po/sl.po
po/sv.po
po/th.po
po/tl.po
po/uk.po
po/vi.po
po/zh_CN.po
po/zh_TW.po
test/integration/framework
test/integration/test-bug-602412-dequote-redirect
test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
test/interactive-helper/aptwebserver.cc
test/interactive-helper/makefile
Diffstat (limited to 'test/libapt')
| -rw-r--r-- | test/libapt/makefile | 1 | ||||
| -rw-r--r-- | test/libapt/uri_test.cc | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/test/libapt/makefile b/test/libapt/makefile index 969d6e2d9..73403b24c 100644 --- a/test/libapt/makefile +++ b/test/libapt/makefile @@ -2,6 +2,7 @@ BASE=../.. SUBDIR=test/libapt BASENAME=_libapt_test +APT_DOMAIN=none # Bring in the default rules include ../../buildlib/defaults.mak diff --git a/test/libapt/uri_test.cc b/test/libapt/uri_test.cc index 99bb3067e..8216ade71 100644 --- a/test/libapt/uri_test.cc +++ b/test/libapt/uri_test.cc @@ -108,5 +108,13 @@ int main() { equals("/debian/", U.Path); } + // Percent-encoding. + { + URI U("ftp://foo:b%40r@example.org"); + equals("foo", U.User); + equals("b@r", U.Password); + equals("ftp://foo:b%40r@example.org/", (std::string) U); + } + return 0; } |