dcallagh-exheres

commit 406ac20885b585e55da5d1d34935fa93f823edeb
parent 52c92f8ef163e24c3de01c732afdff1d07bba2b3
Author: Dan Callaghan <djc@djc.id.au>
Date:   Sun, 16 Oct 2011 11:45:44 +1000

dulwich: fix "TestCase.setUp was not called" test failures

Diffstat:
M
packages/dev-python/dulwich/dulwich-0.8.0.exheres-0
 | 
4
+++-
A
packages/dev-python/dulwich/files/dulwich-0.8.0-testcase-setup.patch
 | 
37
+++++++++++++++++++++++++++++++++++++

2 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/packages/dev-python/dulwich/dulwich-0.8.0.exheres-0 b/packages/dev-python/dulwich/dulwich-0.8.0.exheres-0
@@ -19,6 +19,8 @@ DEPENDENCIES="
 
 BUGS_TO="djc@djc.id.au"
 
+DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}/${PNV}-testcase-setup.patch" )
+
 src_test() {
-    edo python setup.py nosetests
+    edo python setup.py test
 }
diff --git a/packages/dev-python/dulwich/files/dulwich-0.8.0-testcase-setup.patch b/packages/dev-python/dulwich/files/dulwich-0.8.0-testcase-setup.patch
@@ -0,0 +1,37 @@
+Source: Dan Callaghan <djc@djc.id.au>
+Upstream: https://bugs.launchpad.net/dulwich/+bug/875418
+Reason: fix failing tests
+
+diff -ur dulwich-0.8.0.orig/dulwich/tests/test_pack.py dulwich-0.8.0/dulwich/tests/test_pack.py
+--- dulwich-0.8.0.orig/dulwich/tests/test_pack.py	2011-08-07 22:43:22.000000000 +1000
++++ dulwich-0.8.0/dulwich/tests/test_pack.py	2011-10-16 11:37:28.210266511 +1000
+@@ -736,6 +736,7 @@
+ class DeltaChainIteratorTests(TestCase):
+ 
+     def setUp(self):
++        super(DeltaChainIteratorTests, self).setUp()
+         self.store = MemoryObjectStore()
+         self.fetched = set()
+ 
+diff -ur dulwich-0.8.0.orig/dulwich/tests/test_utils.py dulwich-0.8.0/dulwich/tests/test_utils.py
+--- dulwich-0.8.0.orig/dulwich/tests/test_utils.py	2011-08-07 22:43:22.000000000 +1000
++++ dulwich-0.8.0/dulwich/tests/test_utils.py	2011-10-16 11:36:40.514202100 +1000
+@@ -37,6 +37,7 @@
+ class BuildCommitGraphTest(TestCase):
+ 
+     def setUp(self):
++        super(BuildCommitGraphTest, self).setUp()
+         self.store = MemoryObjectStore()
+ 
+     def test_linear(self):
+diff -ur dulwich-0.8.0.orig/dulwich/tests/test_walk.py dulwich-0.8.0/dulwich/tests/test_walk.py
+--- dulwich-0.8.0.orig/dulwich/tests/test_walk.py	2011-08-07 22:43:22.000000000 +1000
++++ dulwich-0.8.0/dulwich/tests/test_walk.py	2011-10-16 11:33:14.202921149 +1000
+@@ -74,6 +74,7 @@
+ class WalkerTest(TestCase):
+ 
+     def setUp(self):
++        super(WalkerTest, self).setUp()
+         self.store = MemoryObjectStore()
+ 
+     def make_commits(self, commit_spec, **kwargs):