summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2014-03-28 06:40:28 -0600
committerCharles Harris <charlesr.harris@gmail.com>2014-03-28 06:40:28 -0600
commitab0642c9780a0c19c701facbc8ea85a278e4324d (patch)
tree01591bdcc6ef5ba47741a375ec02cde817d543fc
parent46929e80777075de0d4b75361da0002fee0a388f (diff)
parent42965e198826257d9de14823a2a359a161caa461 (diff)
downloadnumpy-ab0642c9780a0c19c701facbc8ea85a278e4324d.tar.gz
Merge pull request #4558 from charris/document-assert_raises_regex
DOC: Document assert_raises_regex in numpy reference.
-rw-r--r--doc/source/reference/routines.testing.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/source/reference/routines.testing.rst b/doc/source/reference/routines.testing.rst
index c0bcdaaeb..834d8bbe3 100644
--- a/doc/source/reference/routines.testing.rst
+++ b/doc/source/reference/routines.testing.rst
@@ -25,6 +25,7 @@ Asserts
assert_array_less
assert_equal
assert_raises
+ assert_raises_regex
assert_warns
assert_string_equal