summaryrefslogtreecommitdiff
path: root/numpy/fft/tests
diff options
context:
space:
mode:
authorseberg <sebastian@sipsolutions.net>2014-09-03 20:38:37 +0200
committerseberg <sebastian@sipsolutions.net>2014-09-03 20:38:37 +0200
commit6968c25fa35be43504eb314ac58fc7f64480facc (patch)
treec4f6f8be918634c15156f7728a57f8968d8f0f83 /numpy/fft/tests
parent0f0575c5b14574d55c6237e907f251582aec5767 (diff)
parentb8aedd0e69e862a74cba896bb0dbb1d2748c4edf (diff)
downloadnumpy-6968c25fa35be43504eb314ac58fc7f64480facc.tar.gz
Merge pull request #5035 from juliantaylor/fft-test
TST: join fft threads before getting values
Diffstat (limited to 'numpy/fft/tests')
-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