Fix tests, thanks prometheanfire, bug #421091

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 60 insertions, 4 deletions

diff --git a/app-admin/webapp-config/ChangeLog b/app-admin/webapp-config/ChangeLog
index eacd66426cd1..2cc67b560416 100644
--- a/app-admin/webapp-config/ChangeLog
+++ b/app-admin/webapp-config/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/webapp-config
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.74 2012/06/14 06:35:06 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.75 2012/06/17 18:39:10 blueness Exp $
+
+  17 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  webapp-config-1.50.16-r4.ebuild,
+  +files/webapp-config-1.50.16-fix-unicode-tests.patch:
+  Fix tests, thanks prometheanfire, bug #421091
 
   14 Jun 2012; Jeff Horelick <jdhore@gentoo.org>
   webapp-config-1.50.16-r4.ebuild:
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
index 7c10c5fb8fe4..b959c79d47c2 100644
--- a/app-admin/webapp-config/Manifest
+++ b/app-admin/webapp-config/Manifest
@@ -1,12 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX webapp-config-1.50.16-absolute-paths.patch 1707 RMD160 80f07c8b98c69e13d1c5f7714adeff5a1bc63ff3 SHA1 e3f6b479066b071d6c7d622cba158d9ccc93dcda SHA256 695583ae83a76f7b747cbd3da34a505df2bf0fbac11369d8b0b731b35ce67105
 AUX webapp-config-1.50.16-apache-move.patch 507 RMD160 f86f9a966c0848c36a4404a93e2974357b4e9d6a SHA1 b963fb9cc2b6f10e6dbcf5a3db1178be20268fd6 SHA256 9a78c618d750c79a16d216e00f0b8a9c4058e7ba3d23011d999206e9de825790
 AUX webapp-config-1.50.16-baselayout2.patch 511 RMD160 cfe440f27a29d0db4b536db5b3fe5655ccf1120b SHA1 1d69d0d88a750b05389b71771b371650eaa89913 SHA256 b94bbd0075f22b735189bd6af334ee68f563470632f96f53fa055a0655fb0360
+AUX webapp-config-1.50.16-fix-unicode-tests.patch 1689 RMD160 183b76d5f0b359ab3484be15f230ed26673b8d07 SHA1 6134dca2edb1b77facc91b722dd9d9998667c1a6 SHA256 890ab1a5201d93bb58e63d4e17d05e07bac8e75fa0a675d40a28db17975ed453
 AUX webapp-config-1.50.16-htdocs-symlink.patch 509 RMD160 ad53b2107e5f51626f3996925c9562d77fc1fdb5 SHA1 0adaefe78f272f32a939f56f941634c7f3c8ed6a SHA256 24e48a42f2b08010ad25f5f83bf4f3f47686fbcd786c0547e95c054cf7021b75
 AUX webapp-config-1.50.16-update-servers.patch 2565 RMD160 1547ba9dc6731eb7276bf9257beea5c1ea304096 SHA1 d4fd082058cc3e5b662efd848282efc889dec575 SHA256 4fb781ffd1670de3978f054de9f9c4c9de47f5f760a8b116835343c88b8f1fc7
 DIST webapp-config-1.50.16.tar.gz 103576 RMD160 d3ab1b27d9b279241d2c9ff3b764ac0b9699b0a0 SHA1 dae0b27bf731116516aed16fd10dc75c0146d332 SHA256 cd5cf95d0abc9b469b08e6fffa885df10d3651d558164d35efe8e45df1fc8a5f
 DIST webapp-config-1.50.18.tar.gz 107458 RMD160 8687d2e82ff08fc1b02252fb1ffd2ef40a4fc51a SHA1 84ff4bd6b9a18b6ff5c8ac368e99baa9497bfc57 SHA256 4fdc1f714025a00de237fd494dc7529890cb396cfdc5306d5478fba1745dd797
 EBUILD webapp-config-1.50.16-r1.ebuild 1869 RMD160 91be6b2c332dcdfa182a255389faa21ddff3a562 SHA1 ba63d99f3c806d8bf4c62fe1192d2dbf31df44ac SHA256 e8eb9ea5550c47013cf1525820ee4e20e11faaba901cdcb4fec046463176a970
-EBUILD webapp-config-1.50.16-r4.ebuild 2065 RMD160 00fc1415c1d308666f72b5e28b5ebc7d5d95859b SHA1 674aae38f66cfe5c5bf5d7beae0bb82169740f2e SHA256 712d6791e62e2a219cb628f4665f6b57d12be649cd9d527a3be93a38dabc31ba
+EBUILD webapp-config-1.50.16-r4.ebuild 2118 RMD160 865d2e3442a5a7dd95972f06c7cd94d636d8299f SHA1 c91684eec093124708552ca7cbcef4d9745a90f0 SHA256 9d7758934d1a525ee754a65d89b28085d17fc0f23e0a82d41d777cd9973ba9ff
 EBUILD webapp-config-1.50.18.ebuild 2170 RMD160 aae70b55130e8268cba4c5d2b4d9cfc9e103fe8e SHA1 5a231bd215b98d4d7446b1ff29e1421d94d8afa7 SHA256 acdbc537bd5b905ee96c8f96be53e7fe970fb5de6d4ddd82a07ff8a4569ebd52
-MISC ChangeLog 24628 RMD160 a42357c9ef3c488e82060068a162a35d166bf1c2 SHA1 0097ad015ffc77199acf8e0f10f1fdac42b62683 SHA256 70b0d2adf84afc6bf9c0c818000954d7160130fab0729207725d47a6a9a70b71
+MISC ChangeLog 24825 RMD160 a8538c0d435c72159c81f1781c571044eb0eae8f SHA1 66d2f56f010f2511b89d36b6e19078b94ba20118 SHA256 eb8ce8cabc3f26cf86652fc0f6cf816d850113e41d011e35e61833e4e685162e
 MISC metadata.xml 261 RMD160 2b05c21e79c3272e8d25db4339acbaba883aa65e SHA1 0bc12930918ce109eea376b06fba451c4596726f SHA256 1f116d2ec1e4df7fe23a3a338ff26a26335fd1b01c8c9cb0fea8786c3dc06918
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk/eJFgACgkQl5yvQNBFVTWBpACcDi7bLsQrg83nXcMR0co4ku/r
+q1AAoI26Z/k7Df9+1wCk+GYPHYfu6kFV
+=lv2+
+-----END PGP SIGNATURE-----
diff --git a/app-admin/webapp-config/files/webapp-config-1.50.16-fix-unicode-tests.patch b/app-admin/webapp-config/files/webapp-config-1.50.16-fix-unicode-tests.patch
new file mode 100644
index 000000000000..cad75a2e517f
--- /dev/null
+++ b/app-admin/webapp-config/files/webapp-config-1.50.16-fix-unicode-tests.patch
@@ -0,0 +1,39 @@
+Make strings unicode to fix test failures
+
+Python enables unicode by default.  Various quoted strings used
+in tests were not declared as unicode and so caused false failures.
+This patch addresses this issue.
+
+Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+
+diff -rupN webapp-config-1.50.16/WebappConfig.orig/db.py webapp-config-1.50.16/WebappConfig/db.py
+--- webapp-config-1.50.16/WebappConfig.orig/db.py	2012-06-17 11:10:15.964264617 -0500
++++ webapp-config-1.50.16/WebappConfig/db.py	2012-06-17 11:11:05.364265831 -0500
+@@ -186,7 +186,7 @@ class WebappDB(AppHierarchy):
+     >>> sb = [i[1] for i in b.list_locations().items()]
+     >>> sb.sort(lambda x,y: cmp(x[0]+x[1],y[0]+y[1]))
+     >>> sb
+-    [['gallery', '1.4.4_p6'], ['gallery', '2.0_rc2'], ['horde', '3.0.5'], ['phpldapadmin', '0.9.7_alpha4']]
++    [[u'gallery', u'1.4.4_p6'], [u'gallery', u'2.0_rc2'], [u'horde', u'3.0.5'], [u'phpldapadmin', u'0.9.7_alpha4']]
+ 
+     >>> c = WebappDB(here + '/tests/testfiles/webapps',
+     ...              package = 'horde', version = '3.0.5')
+@@ -572,7 +572,7 @@ class WebappSource(AppHierarchy):
+         ...             'horde', '3.0.5')
+         >>> d = a.get_source_directories('htdocs')
+         >>> [i for i in d if i != '.svn']
+-        ['dir1', 'dir2']
++        [u'dir1', u'dir2']
+         '''
+         dirs = []
+ 
+@@ -604,7 +604,7 @@ class WebappSource(AppHierarchy):
+         >>> a = WebappSource(here + '/tests/testfiles/share-webapps',
+         ...             'horde', '3.0.5')
+         >>> a.get_source_files('htdocs')
+-        ['test1', 'test2']
++        [u'test1', u'test2']
+         '''
+ 
+         files = []
diff --git a/app-admin/webapp-config/webapp-config-1.50.16-r4.ebuild b/app-admin/webapp-config/webapp-config-1.50.16-r4.ebuild
index 96744da003ad..96cf263dcc03 100644
--- a/app-admin/webapp-config/webapp-config-1.50.16-r4.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.50.16-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r4.ebuild,v 1.4 2012/06/14 06:35:06 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r4.ebuild,v 1.5 2012/06/17 18:39:10 blueness Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -29,6 +29,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-htdocs-symlink.patch"
 	epatch "${FILESDIR}/${P}-absolute-paths.patch"
 	epatch "${FILESDIR}/${P}-update-servers.patch"
+	epatch "${FILESDIR}/${P}-fix-unicode-tests.patch"
 	# Do not build nor install eclass manual, bug 322759
 	rm -f doc/webapp.eclass.5*
 	sed -e '/MAN_PAGES/s/webapp.eclass.5//' \