[Python-modules-commits] [parallax] 05/08: merge patched into master

[Valentin Vidic]

This is an automated email from the git hooks/post-receive script.

vvidic-guest pushed a commit to branch master
in repository parallax.

commit e9152853c9d31ad5706afac303b44fc3a8cc9aea
Merge: aba4c81 eb95c8e
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Sun Nov 13 22:05:23 2016 +0100

    merge patched into master

 debian/.git-dpm                                     |  4 ++--
 ...ke-testsuite-exit-with-non-zero-on-failure.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 test/test_api.py                                    |  4 +++-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 05bbc40,0000000..620b1cd
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- fdf17ec903babd9f496782c607826b5482fc8247
- fdf17ec903babd9f496782c607826b5482fc8247
++eb95c8ea45b9f570ca6b6d2c11455b703a309f16
++eb95c8ea45b9f570ca6b6d2c11455b703a309f16
 +fdf17ec903babd9f496782c607826b5482fc8247
 +fdf17ec903babd9f496782c607826b5482fc8247
 +parallax_1.0.1.orig.tar.gz
 +f1633d929fc6c4565974516ddced1eccddfc40dd
 +16086
diff --cc debian/patches/0001-Make-testsuite-exit-with-non-zero-on-failure.patch
index 0000000,0000000..e21ec6c
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Make-testsuite-exit-with-non-zero-on-failure.patch
@@@ -1,0 -1,0 +1,21 @@@
++From eb95c8ea45b9f570ca6b6d2c11455b703a309f16 Mon Sep 17 00:00:00 2001
++From: Valentin Vidic <Valentin.Vidic at CARNet.hr>
++Date: Sun, 13 Nov 2016 22:04:53 +0100
++Subject: Make testsuite exit with non-zero on failure
++
++---
++ test/test_api.py | 4 +++-
++ 1 file changed, 3 insertions(+), 1 deletion(-)
++
++diff --git a/test/test_api.py b/test/test_api.py
++index b291468..1f75b86 100644
++--- a/test/test_api.py
+++++ b/test/test_api.py
++@@ -83,4 +83,6 @@ if __name__ == '__main__':
++     suite = unittest.TestSuite()
++     suite.addTest(unittest.makeSuite(CallTest, "test"))
++     suite.addTest(unittest.makeSuite(CopySlurpTest, "test"))
++-    unittest.TextTestRunner().run(suite)
+++    result = unittest.TextTestRunner().run(suite)
+++    if not result.wasSuccessful():
+++        sys.exit(1)
diff --cc debian/patches/series
index 0000000,0000000..e1cde84
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Make-testsuite-exit-with-non-zero-on-failure.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/parallax.git