[Python-modules-commits] [txfixtures] 03/03: Release 0.2.5-1

[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 cea07f92d6c0ff1de369e6ad8e5a0f1e78160b57
Author: Free Ekanayaka <freee at debian.org>
Date:   Sun Jan 8 09:29:26 2017 +0000

    Release 0.2.5-1
---
 debian/changelog                                   |  9 +++++++++
 ...increase-mongodb-integration-test-timeout.patch | 22 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index da6daf5..f7493e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+txfixtures (0.2.5-1) unstable; urgency=medium
+
+  * New upstream version 0.2.5
+
+    - Fixes timeout being set with the wrong API causing flakiness in
+      test_non_executable_command (Closes: #850552)
+
+ -- Free Ekanayaka <freee at debian.org>  Sun, 08 Jan 2017 09:26:14 +0000
+
 txfixtures (0.2.3-1) unstable; urgency=medium
 
   * New upstream version 0.2.3
diff --git a/debian/patches/0004-increase-mongodb-integration-test-timeout.patch b/debian/patches/0004-increase-mongodb-integration-test-timeout.patch
deleted file mode 100644
index 954fa49..0000000
--- a/debian/patches/0004-increase-mongodb-integration-test-timeout.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Free Ekanayaka <freee at debian.org>
-Date: Thu, 5 Jan 2017 21:01:16 +0000
-Subject: increase-mongodb-integration-test-timeout
-
-MongoDB can take a while to start.
----
- tests/test_mongodb.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test_mongodb.py b/tests/test_mongodb.py
-index adb13e1..53a0143 100644
---- a/tests/test_mongodb.py
-+++ b/tests/test_mongodb.py
-@@ -12,7 +12,7 @@ class MongoDBIntegrationTest(TestCase):
-         super(MongoDBIntegrationTest, self).setUp()
-         self.logger = self.useFixture(FakeLogger())
-         self.useFixture(Reactor())
--        self.mongodb = MongoDB(timeout=5)
-+        self.mongodb = MongoDB(timeout=25)
- 
-     def test_client(self):
-         """
diff --git a/debian/patches/series b/debian/patches/series
index 6cb1868..40262fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 0001-backport-testtools-twistedsupport.patch
 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