[Python-modules-commits] [txfixtures] 14/14: Fix flake test_hung test

[Free Ekanayaka]

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

freee pushed a commit to branch master
in repository txfixtures.

commit 72b7858d51174d6f556ef58a8ef159802b99cde0
Author: Free Ekanayaka <freee at debian.org>
Date:   Thu Jan 5 23:44:27 2017 +0000

    Fix flake test_hung test
---
 ...02-fix-tests-depending-on-newer-testtools.patch |  2 +-
 .../patches/0005-fix-flaky-service-hung-test.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/debian/patches/0002-fix-tests-depending-on-newer-testtools.patch b/debian/patches/0002-fix-tests-depending-on-newer-testtools.patch
index 371dfca..8924681 100644
--- a/debian/patches/0002-fix-tests-depending-on-newer-testtools.patch
+++ b/debian/patches/0002-fix-tests-depending-on-newer-testtools.patch
@@ -10,7 +10,7 @@ testtools releases.
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/tests/test_service.py b/tests/test_service.py
-index 25d0617..3b466c0 100644
+index 141070b..24cbcdd 100644
 --- a/tests/test_service.py
 +++ b/tests/test_service.py
 @@ -3,7 +3,7 @@ import signal
diff --git a/debian/patches/0005-fix-flaky-service-hung-test.patch b/debian/patches/0005-fix-flaky-service-hung-test.patch
new file mode 100644
index 0000000..bdd388e
--- /dev/null
+++ b/debian/patches/0005-fix-flaky-service-hung-test.patch
@@ -0,0 +1,23 @@
+From: Free Ekanayaka <freee at debian.org>
+Date: Thu, 5 Jan 2017 23:42:16 +0000
+Subject: fix-flaky-service-hung-test
+
+Increase the timeout used to detect if service process is
+hung.
+---
+ tests/test_service.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_service.py b/tests/test_service.py
+index 24cbcdd..97a871c 100644
+--- a/tests/test_service.py
++++ b/tests/test_service.py
+@@ -70,7 +70,7 @@ class ServiceIntegrationTest(TestCase):
+         If the given command doesn't terminate with SIGTERM, it's SIGKILL'ed.
+         """
+         self.script.hang()
+-        self.fixture.protocol.timeout = 0.2
++        self.fixture.protocol.timeout = 1.0
+         self.fixture.expectOutput("hanging")
+         self.fixture.setUp()
+         self.fixture.cleanUp()
diff --git a/debian/patches/series b/debian/patches/series
index d7673f5..6cb1868 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-fix-tests-depending-on-newer-testtools.patch
 0003-skip-phantomjs-tests.patch
 0004-increase-mongodb-integration-test-timeout.patch
+0005-fix-flaky-service-hung-test.patch

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