[Pkg-privacy-commits] [flashproxy] 51/65: Fix build for slower machines. (Closes: #765156)

[Ximin Luo]

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

infinity0 pushed a commit to branch _volatile-rc
in repository flashproxy.

commit fedcd28195f03fdc9bb456b7e16d9c14b3648478
Author: Ximin Luo <infinity0 at pwned.gg>
Date:   Sun Nov 2 19:47:02 2014 +0000

    Fix build for slower machines. (Closes: #765156)
---
 debian/changelog                        |  6 ++++++
 debian/patches/more-flexible-wait.patch | 31 +++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 38 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 32d41fa..dad5917 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+flashproxy (1.7-2) UNRELEASED; urgency=medium
+
+  * Fix build for slower machines. (Closes: #765156)
+
+ -- Ximin Luo <infinity0 at pwned.gg>  Sun, 02 Nov 2014 19:44:46 +0000
+
 flashproxy (1.7-1) unstable; urgency=low
 
   * Initial release. (Closes: #721845)
diff --git a/debian/patches/more-flexible-wait.patch b/debian/patches/more-flexible-wait.patch
new file mode 100644
index 0000000..0439fd1
--- /dev/null
+++ b/debian/patches/more-flexible-wait.patch
@@ -0,0 +1,31 @@
+Description: Fix build for slower machines
+ Use a more flexible wait behaviour in the facilitator test.
+Author: Ximin Luo <infinity0 at torproject.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765156
+Applied-Upstream: commit:c89d0c04a6e454c54a58cd17c0b2e7c7267f15fc
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/facilitator/fp-facilitator-test.py
++++ b/facilitator/fp-facilitator-test.py
+@@ -209,7 +209,20 @@
+         self.relay_file.seek(0)
+         fn = os.path.join(os.path.dirname(__file__), "./fp-facilitator")
+         self.process = subprocess.Popen(["python", fn, "-d", "-p", str(FACILITATOR_PORT), "-r", self.relay_file.name, "-l", "/dev/null"])
+-        time.sleep(0.1)
++        self.waitForChild()
++
++    def waitForChild(self):
++        """Wait until the child process is responsive. This takes different
++        times on different machines so be flexible in how long to wait. e.g.
++        see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765156"""
++        for i in xrange(0, 20):
++            try:
++                s = fac.fac_socket(FACILITATOR_ADDR)
++                s.close()
++                return
++            except socket.error as e:
++                time.sleep(0.05)
++        raise e
+ 
+     def tearDown(self):
+         ret = self.process.poll()
diff --git a/debian/patches/series b/debian/patches/series
index 67012f8..9a9a0bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ nodejs-shebang.patch
 disable-flaky-test.patch
 generate-key-in-initscript.patch
 disable-xsltproc-net.patch
+more-flexible-wait.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/flashproxy.git