[Python-modules-commits] [python-ws4py] 02/06: merge patched into master

[Sandro Tosi]

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

morph pushed a commit to branch master
in repository python-ws4py.

commit 025118c9ba81494c9df46870f414b0e0a085c329
Merge: d84e7ba 2d39408
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Feb 19 20:54:26 2017 -0500

    merge patched into master

 debian/.git-dpm                                     |  4 ++--
 ...003-fix-unittest-failing-on-1-CPU-machines.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 test/test_manager.py                                |  1 +
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 26482b7,0000000..ee54941
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 750981d4c6165b945def438b4dd790c3326d03de
- 750981d4c6165b945def438b4dd790c3326d03de
++2d394089d01463eb8ae1da39506d0852feefc820
++2d394089d01463eb8ae1da39506d0852feefc820
 +7f43f2a6bff1aabafad023652042439d7b9b8d84
 +7f43f2a6bff1aabafad023652042439d7b9b8d84
 +python-ws4py_0.3.4.orig.tar.gz
 +865bf7f4524ac4c5c3b16c9b6efd2c6bc24c497a
 +64676
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-fix-unittest-failing-on-1-CPU-machines.patch
index 0000000,0000000..7541a15
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-fix-unittest-failing-on-1-CPU-machines.patch
@@@ -1,0 -1,0 +1,21 @@@
++From 2d394089d01463eb8ae1da39506d0852feefc820 Mon Sep 17 00:00:00 2001
++From: Sandro Tosi <morph at debian.org>
++Date: Sun, 19 Feb 2017 20:54:20 -0500
++Subject: fix unittest failing on 1 CPU machines
++
++---
++ test/test_manager.py | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/test/test_manager.py b/test/test_manager.py
++index da57d44..fceb77d 100644
++--- a/test/test_manager.py
+++++ b/test/test_manager.py
++@@ -62,6 +62,7 @@ class WSManagerTest(unittest.TestCase):
++         self.assertFalse(m.running)
++         
++         m.start()
+++        time.sleep(0.2)
++         self.assertTrue(m.running)
++ 
++         m.stop()
diff --cc debian/patches/series
index 6a6a433,0000000..2b1859b
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-Fix-tests.patch
 +0002-Make-intersphinx-use-object.inv-from-python-doc.patch
++0003-fix-unittest-failing-on-1-CPU-machines.patch

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