[Python-apps-commits] r13575 - in packages/beets/trunk/debian (6 files)

[stefanor at users.alioth.debian.org]

    Date: Tuesday, August 30, 2016 @ 05:06:44
  Author: stefanor
Revision: 13575

* Fix occasional FTBFS due to lack of mock cleanup. Thanks Santiago Vila.
  (Closes: #835937)
* Fix autopkgtests by adding the test dependencies, and a sane unittest
  incantation.
* Drop unittest2 and nose Build-Depends, no longer used.

Added:
  packages/beets/trunk/debian/patches/fix-test_nonexistent_file
Modified:
  packages/beets/trunk/debian/changelog
  packages/beets/trunk/debian/control
  packages/beets/trunk/debian/patches/series
  packages/beets/trunk/debian/tests/control
  packages/beets/trunk/debian/tests/unittests

Modified: packages/beets/trunk/debian/changelog
===================================================================
--- packages/beets/trunk/debian/changelog	2016-08-29 21:06:30 UTC (rev 13574)
+++ packages/beets/trunk/debian/changelog	2016-08-30 05:06:44 UTC (rev 13575)
@@ -1,3 +1,13 @@
+beets (1.3.19-2) UNRELEASED; urgency=medium
+
+  * Fix occasional FTBFS due to lack of mock cleanup. Thanks Santiago Vila.
+    (Closes: #835937)
+  * Fix autopkgtests by adding the test dependencies, and a sane unittest
+    incantation.
+  * Drop unittest2 and nose Build-Depends, no longer used.
+
+ -- Stefano Rivera <stefanor at debian.org>  Tue, 23 Aug 2016 01:20:13 -0700
+
 beets (1.3.19-1) unstable; urgency=medium
 
   * New upstream release. (Closes: #775719, #792060, LP: #1502394)

Modified: packages/beets/trunk/debian/control
===================================================================
--- packages/beets/trunk/debian/control	2016-08-29 21:06:30 UTC (rev 13574)
+++ packages/beets/trunk/debian/control	2016-08-30 05:06:44 UTC (rev 13575)
@@ -11,7 +11,6 @@
  libc-bin (>= 2.13),
  python-all (>= 2.6.6-3~),
  python-bs4,
- python-docutils,
  python-enum34 (>= 1.0.4),
  python-flask,
  python-mock,
@@ -19,7 +18,6 @@
  python-munkres,
  python-musicbrainzngs (>= 0.4),
  python-mutagen (>= 1.27),
- python-nose,
  python-pathlib,
  python-pylast,
  python-rarfile,
@@ -27,7 +25,6 @@
  python-setuptools,
  python-sphinx (>= 1.0.7+dfsg),
  python-unidecode,
- python-unittest2,
  python-xdg,
  python-yaml
 X-Python-Version: >= 2.7

Added: packages/beets/trunk/debian/patches/fix-test_nonexistent_file
===================================================================
--- packages/beets/trunk/debian/patches/fix-test_nonexistent_file	                        (rev 0)
+++ packages/beets/trunk/debian/patches/fix-test_nonexistent_file	2016-08-30 05:06:44 UTC (rev 13575)
@@ -0,0 +1,34 @@
+Description: Manage patching of try_filesize
+Author: Jesse Weinstein <jesse at wefu.org>
+Origin: upstream, https://github.com/beetbox/beets/issues/2137
+Bug-Debian: https://bugs.debian.org/835937
+Bug-Upstream: https://github.com/beetbox/beets/issues/2135
+
+--- a/test/test_ui.py
++++ b/test/test_ui.py
+@@ -24,7 +24,7 @@ import subprocess
+ import platform
+ from copy import deepcopy
+ 
+-from mock import patch
++from mock import patch, Mock
+ from test import _common
+ from test._common import unittest
+ from test.helper import capture_stdout, has_program, TestHelper, control_stdin
+@@ -1053,6 +1053,7 @@ class ShowChangeTest(_common.TestCase):
+                         u'caf.mp3 ->' in msg)
+ 
+ 
++ at patch('beets.library.Item.try_filesize', Mock(return_value=987))
+ class SummarizeItemsTest(_common.TestCase):
+     def setUp(self):
+         super(SummarizeItemsTest, self).setUp()
+@@ -1061,8 +1062,6 @@ class SummarizeItemsTest(_common.TestCase):
+         item.length = 10 * 60 + 54
+         item.format = "F"
+         self.item = item
+-        fsize_mock = patch('beets.library.Item.try_filesize').start()
+-        fsize_mock.return_value = 987
+ 
+     def test_summarize_item(self):
+         summary = commands.summarize_items([], True)

Modified: packages/beets/trunk/debian/patches/series
===================================================================
--- packages/beets/trunk/debian/patches/series	2016-08-29 21:06:30 UTC (rev 13574)
+++ packages/beets/trunk/debian/patches/series	2016-08-30 05:06:44 UTC (rev 13575)
@@ -1,4 +1,5 @@
 fix-test_hidden
 no-jellyfish
 fix-test_mediafile_edge
+fix-test_nonexistent_file
 skip-test_query-path-tests

Modified: packages/beets/trunk/debian/tests/control
===================================================================
--- packages/beets/trunk/debian/tests/control	2016-08-29 21:06:30 UTC (rev 13574)
+++ packages/beets/trunk/debian/tests/control	2016-08-30 05:06:44 UTC (rev 13575)
@@ -1,2 +1,13 @@
 Tests: unittests
-Depends: @, python-nose, python-all, python-unittest2
+Depends:
+ beets,
+ python-all,
+ python-bs4,
+ python-flask,
+ python-mock,
+ python-mpd,
+ python-pathlib,
+ python-pylast,
+ python-rarfile,
+ python-responses,
+ python-xdg

Modified: packages/beets/trunk/debian/tests/unittests
===================================================================
--- packages/beets/trunk/debian/tests/unittests	2016-08-29 21:06:30 UTC (rev 13574)
+++ packages/beets/trunk/debian/tests/unittests	2016-08-30 05:06:44 UTC (rev 13575)
@@ -5,12 +5,16 @@
 export LC_ALL=C.UTF-8
 export PYTHONPATH=/usr/share/beets
 
-pythons="$(pyversions -rv)"
+pythons="$(pyversions -r)"
 
 cp -a test $ADTTMP
 cd "$ADTTMP"
 
-for py in $pythons; do
-	echo "=== python$py ==="
-	nosetests-$py test 2>&1
+# The tests assume beetsplug is found above them, and do unspeakable evil with
+# __path__ to ensure that their local beetsplug is used.
+ln -s /usr/share/beets/beetsplug .
+
+for python in $pythons; do
+	echo "=== $python ==="
+	$python -m unittest discover -p 'test_*' 2>&1
 done