diff options
| author | Nathaniel J. Smith <njs@pobox.com> | 2012-07-12 13:20:20 +0100 |
|---|---|---|
| committer | Nathaniel J. Smith <njs@pobox.com> | 2012-07-17 16:51:31 +0100 |
| commit | b26c675e2a91e1042f8f8d634763942c87fbbb6e (patch) | |
| tree | 7dbe064c0ba2364367948c34506ebfad36ac310c /numpy/random/tests/test_regression.py | |
| parent | 64c3a8f464e1b187aef833dda5ad0ce7dba44ef4 (diff) | |
| download | numpy-b26c675e2a91e1042f8f8d634763942c87fbbb6e.tar.gz | |
[FIX] Make np.random.shuffle less brain-dead
The logic in np.random.shuffle was... not very sensible. Fixes trac
ticket #2074.
This patch also exposes a completely unrelated issue in
numpy.testing. Filed as Github issue #347 and marked as knownfail for
now.
Diffstat (limited to 'numpy/random/tests/test_regression.py')
| -rw-r--r-- | numpy/random/tests/test_regression.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/numpy/random/tests/test_regression.py b/numpy/random/tests/test_regression.py index f5039c09a..4168ef9a4 100644 --- a/numpy/random/tests/test_regression.py +++ b/numpy/random/tests/test_regression.py @@ -52,6 +52,16 @@ class TestRegression(TestCase): except: raise AssertionError + def test_shuffle_mixed_dimension(self): + """Test for trac ticket #2074""" + for t in [[1, 2, 3, None], + [(1, 1), (2, 2), (3, 3), None], + [1, (2, 2), (3, 3), None], + [(1, 1), 2, 3, None]]: + np.random.seed(12345) + shuffled = list(t) + random.shuffle(shuffled) + assert_array_equal(shuffled, [t[0], t[3], t[1], t[2]]) if __name__ == "__main__": run_module_suite() |