Package: python-traceback2
Version: 1.4.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied by James Page to run the unit
tests during build.  It seemed like a good idea, so I'm passing it on to
you.  Thanks for your consideration.

-- System Information:
Debian Release: jessie/sid
  APT prefers wily-updates
  APT policy: (500, 'wily-updates'), (500, 'wily-security'), (500, 'wily')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.1.0-2-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru python-traceback2-1.4.0/debian/control python-traceback2-1.4.0/debian/control
--- python-traceback2-1.4.0/debian/control	2015-07-08 09:29:18.000000000 -0400
+++ python-traceback2-1.4.0/debian/control	2015-08-17 14:00:47.000000000 -0400
@@ -14,8 +14,16 @@
                python3-setuptools,
 Build-Depends-Indep: python-contextlib2,
                      python-fixtures,
+                     python-linecache2,
+                     python-six,
                      python-testtools,
                      python-unittest2,
+                     python3-contextlib2,
+                     python3-fixtures,
+                     python3-linecache2,
+                     python3-six,
+                     python3-testtools,
+                     python3-unittest2,
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-traceback2.git
 Vcs-Git: git://anonscm.debian.org/openstack/python-traceback2.git
diff -Nru python-traceback2-1.4.0/debian/patches/fix-encoding.patch python-traceback2-1.4.0/debian/patches/fix-encoding.patch
--- python-traceback2-1.4.0/debian/patches/fix-encoding.patch	1969-12-31 19:00:00.000000000 -0500
+++ python-traceback2-1.4.0/debian/patches/fix-encoding.patch	2015-08-04 06:28:52.000000000 -0400
@@ -0,0 +1,23 @@
+Description: Skip test_format_unicode_filename under py3
+Author: James Page <james.p...@ubuntu.com>
+Forwarded: https://github.com/testing-cabal/traceback2/pull/6
+
+--- a/traceback2/tests/test_traceback.py
++++ b/traceback2/tests/test_traceback.py
+@@ -607,6 +607,7 @@ class TestStack(unittest.TestCase):
+             ['  File "foo.py", line 1, in fred\n    line\n'],
+             s.format())
+ 
++    @unittest.skipUnless(sys.version_info[0] < 3, "Applies to 2.x only.")
+     @unittest.skipIf(sys.getfilesystemencoding()=='ANSI_X3.4-1968',
+                      'Requires non-ascii fs encoding')
+     def test_format_unicode_filename(self):
+@@ -651,7 +652,7 @@ class TestStack(unittest.TestCase):
+                 traceback.walk_stack(None), capture_locals=True, limit=1)
+         s = some_inner(3, 4)
+         self.assertEqual(
+-            ['  File "' + FNAME + '", line 651, '
++            ['  File "' + FNAME + '", line 652, '
+              'in some_inner\n'
+              '    traceback.walk_stack(None), capture_locals=True, limit=1)\n'
+              '    a = 1\n'
diff -Nru python-traceback2-1.4.0/debian/patches/series python-traceback2-1.4.0/debian/patches/series
--- python-traceback2-1.4.0/debian/patches/series	1969-12-31 19:00:00.000000000 -0500
+++ python-traceback2-1.4.0/debian/patches/series	2015-08-04 06:13:54.000000000 -0400
@@ -0,0 +1 @@
+fix-encoding.patch
diff -Nru python-traceback2-1.4.0/debian/rules python-traceback2-1.4.0/debian/rules
--- python-traceback2-1.4.0/debian/rules	2015-07-08 09:29:18.000000000 -0400
+++ python-traceback2-1.4.0/debian/rules	2015-08-04 06:17:08.000000000 -0400
@@ -28,7 +28,18 @@
 
 override_dh_clean:
 	dh_clean -O--buildsystem=python_distutils
-	rm -rf build
+	rm -rf build .testrepository
+
+override_dh_auto_test:
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+	@echo "===> Running tests"
+	set -ex && for i in $(PYTHONS) $(PYTHON3S) ; do \
+		PYMAJOR=`echo $$i | cut -d'.' -f1` ; \
+		echo "===> Testing with python$$i (python$$PYMAJOR)" ; \
+		PYTHON=python$$i python$$PYMAJOR-unit2; \
+	done
+endif
+
 
 # Commands not to run
 override_dh_installcatalogs:

Reply via email to