summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Taylor <jtaylor.debian@googlemail.com>2014-09-03 20:20:03 +0200
committerJulian Taylor <jtaylor.debian@googlemail.com>2014-09-03 20:20:42 +0200
commitb8aedd0e69e862a74cba896bb0dbb1d2748c4edf (patch)
tree23dbc2d1974102ffc630d39cc07f075c90fc90a8
parent709a06d0e9db862a8dd519db13724a4c59de7d69 (diff)
downloadnumpy-b8aedd0e69e862a74cba896bb0dbb1d2748c4edf.tar.gz
TST: join fft threads before getting values
avoids timeouts on slow machines
-rw-r--r--numpy/fft/tests/test_fftpack.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/fft/tests/test_fftpack.py b/numpy/fft/tests/test_fftpack.py
index ac892c83b..45b5ac784 100644
--- a/numpy/fft/tests/test_fftpack.py
+++ b/numpy/fft/tests/test_fftpack.py
@@ -48,11 +48,11 @@ class TestFFTThreadSafe(TestCase):
for i in range(self.threads)]
[x.start() for x in t]
+ [x.join() for x in t]
# Make sure all threads returned the correct value
for i in range(self.threads):
assert_array_equal(q.get(timeout=5), expected,
'Function returned wrong value in multithreaded context')
- [x.join() for x in t]
def test_fft(self):
a = np.ones(self.input_shape) * 1+0j