[Python-apps-commits] r7946 - in packages/beets/trunk/debian (4 files)

[stefanor at users.alioth.debian.org]

    Date: Tuesday, December 13, 2011 @ 14:20:25
  Author: stefanor
Revision: 7946

Fix test failures in a clean environment

Modified:
  packages/beets/trunk/debian/changelog
  packages/beets/trunk/debian/control
  packages/beets/trunk/debian/patches/series
  packages/beets/trunk/debian/rules

Modified: packages/beets/trunk/debian/changelog
===================================================================
--- packages/beets/trunk/debian/changelog	2011-12-13 13:30:24 UTC (rev 7945)
+++ packages/beets/trunk/debian/changelog	2011-12-13 14:20:25 UTC (rev 7946)
@@ -8,6 +8,9 @@
     - Use upstream's manpages.
   * Run tests, they are now included.
     - Use unittest2 to provide newer unittest features for python2.6.
+    - Build-Depend on python-mutagen, python-munkres, and python-unidecode
+    - Test under the en_US.UTF-8 locale, to work around a test expecting a
+      UTF-8 locale.
   * Suggest python-rgain, for the rgain plugin.
 
  -- Stefano Rivera <stefanor at debian.org>  Tue, 13 Dec 2011 12:03:09 +0200

Modified: packages/beets/trunk/debian/control
===================================================================
--- packages/beets/trunk/debian/control	2011-12-13 13:30:24 UTC (rev 7945)
+++ packages/beets/trunk/debian/control	2011-12-13 14:20:25 UTC (rev 7946)
@@ -5,10 +5,14 @@
 Uploaders: Stefano Rivera <stefanor at debian.org>
 Build-Depends:
  debhelper (>= 7.0.50~),
+ locales,
  python-all (>= 2.6.6-3~),
  python-docutils,
+ python-munkres,
+ python-mutagen,
  python-setuptools,
  python-sphinx (>= 1.0.7+dfsg),
+ python-unidecode,
  python-unittest2
 X-Python-Version: >= 2.5
 Standards-Version: 3.9.2

Modified: packages/beets/trunk/debian/patches/series
===================================================================
--- packages/beets/trunk/debian/patches/series	2011-12-13 13:30:24 UTC (rev 7945)
+++ packages/beets/trunk/debian/patches/series	2011-12-13 14:20:25 UTC (rev 7946)
@@ -1,2 +1,2 @@
+unittest2
 private-module
-unittest2

Modified: packages/beets/trunk/debian/rules
===================================================================
--- packages/beets/trunk/debian/rules	2011-12-13 13:30:24 UTC (rev 7945)
+++ packages/beets/trunk/debian/rules	2011-12-13 14:20:25 UTC (rev 7946)
@@ -8,8 +8,15 @@
 	$(MAKE) -C docs html man BUILDDIR=$(CURDIR)/build/docs
 
 override_dh_auto_test:
+	# Tests (non-destructively) open the database
+	mkdir -p build/home
+	# Tests need UTF-8 locale
+	mkdir -p build/locale
+	localedef -f UTF-8 -i en_US build/locale/en_US.UTF-8/
 	set -e -x; \
 	for python in $(shell pyversions -r); do \
+		HOME=$(CURDIR)/build/home \
+		LOCPATH=$(CURDIR)/build/locale LC_ALL=en_US.UTF-8 \
 		$$python setup.py test; \
 	done