[Python-modules-commits] [txfixtures] 03/03: Update changelog for 0.4.0-1 release

[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 3965eca3115eaa2c5e2e52a4a1d074a93536accf
Author: Free Ekanayaka <freee at debian.org>
Date:   Mon Feb 6 11:56:18 2017 +0000

    Update changelog for 0.4.0-1 release
---
 debian/changelog                                                  | 6 ++++++
 debian/patches/0002-fix-tests-depending-on-newer-testtools.patch  | 4 ++--
 ...ice-hung-test.patch => 0003-fix-flaky-service-hung-test.patch} | 8 ++++----
 debian/patches/0004-skip-phantomjs-tests.patch                    | 6 +++---
 debian/patches/series                                             | 2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5aa00c8..052aa43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+txfixtures (0.4.0-1) unstable; urgency=medium
+
+  * New upstream version 0.4.0
+
+ -- Free Ekanayaka <freee at debian.org>  Mon, 06 Feb 2017 11:56:15 +0000
+
 txfixtures (0.2.7-1) unstable; urgency=medium
 
   * New upstream version 0.2.7
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 8924681..f0b8b74 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 141070b..24cbcdd 100644
+index 0aca936..852d406 100644
 --- a/tests/test_service.py
 +++ b/tests/test_service.py
 @@ -3,7 +3,7 @@ import signal
@@ -23,7 +23,7 @@ index 141070b..24cbcdd 100644
  from fixtures import (
      FakeLogger,
 diff --git a/txfixtures/tests/test_service.py b/txfixtures/tests/test_service.py
-index 919fd78..0b33b67 100644
+index c0e117b..eb834f7 100644
 --- a/txfixtures/tests/test_service.py
 +++ b/txfixtures/tests/test_service.py
 @@ -10,7 +10,7 @@ from testtools.matchers import (
diff --git a/debian/patches/0005-fix-flaky-service-hung-test.patch b/debian/patches/0003-fix-flaky-service-hung-test.patch
similarity index 78%
rename from debian/patches/0005-fix-flaky-service-hung-test.patch
rename to debian/patches/0003-fix-flaky-service-hung-test.patch
index bdd388e..4f6375d 100644
--- a/debian/patches/0005-fix-flaky-service-hung-test.patch
+++ b/debian/patches/0003-fix-flaky-service-hung-test.patch
@@ -1,5 +1,5 @@
 From: Free Ekanayaka <freee at debian.org>
-Date: Thu, 5 Jan 2017 23:42:16 +0000
+Date: Mon, 6 Feb 2017 12:09:25 +0000
 Subject: fix-flaky-service-hung-test
 
 Increase the timeout used to detect if service process is
@@ -9,14 +9,14 @@ hung.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tests/test_service.py b/tests/test_service.py
-index 24cbcdd..97a871c 100644
+index 852d406..a2dc652 100644
 --- a/tests/test_service.py
 +++ b/tests/test_service.py
-@@ -70,7 +70,7 @@ class ServiceIntegrationTest(TestCase):
+@@ -73,7 +73,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 = 0.5
 +        self.fixture.protocol.timeout = 1.0
          self.fixture.expectOutput("hanging")
          self.fixture.setUp()
diff --git a/debian/patches/0004-skip-phantomjs-tests.patch b/debian/patches/0004-skip-phantomjs-tests.patch
index 9f70eae..26190f9 100644
--- a/debian/patches/0004-skip-phantomjs-tests.patch
+++ b/debian/patches/0004-skip-phantomjs-tests.patch
@@ -1,5 +1,5 @@
 From: Free Ekanayaka <freee at debian.org>
-Date: Thu, 2 Feb 2017 09:35:44 +0000
+Date: Mon, 6 Feb 2017 12:10:17 +0000
 Subject: skip-phantomjs-tests
 
 Skip PhantomJS tests since the phantomjs package in Debian does
@@ -9,7 +9,7 @@ not support running headless.
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/tests/test_phantomjs.py b/tests/test_phantomjs.py
-index 64b6233..be4a2a6 100644
+index 1407acc..09e58ec 100644
 --- a/tests/test_phantomjs.py
 +++ b/tests/test_phantomjs.py
 @@ -1,4 +1,4 @@
@@ -20,7 +20,7 @@ index 64b6233..be4a2a6 100644
  
 @@ -28,7 +28,7 @@ class PhantomJSIntegrationTest(TestCase):
  
-         self.fixture = PhantomJS(timeout=5)
+         self.fixture = PhantomJS(reactor, timeout=10)
  
 -    @skipIf(not hasTwist, "twist executable not available")
 +    @skip("Debian's phantomjs can't run headless")
diff --git a/debian/patches/series b/debian/patches/series
index 7bb3ff5..d47c454 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 0001-backport-testtools-twistedsupport.patch
 0002-fix-tests-depending-on-newer-testtools.patch
-0005-fix-flaky-service-hung-test.patch
+0003-fix-flaky-service-hung-test.patch
 0004-skip-phantomjs-tests.patch

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