summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-09 02:19:08 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-09 02:19:08 +0000
commitb7ebcb6000649add1863a0f520b4b3d84753914f (patch)
tree80e455fc974f66b8a5f436df56f6d58de61da9a2 /lib
parent7083fd551a823da87fb70317c180d637e54e39f6 (diff)
merges r21376 from trunk into ruby_1_9_1.
* lib/test/unit/assertions.rb (assert_no_match): don't count up as two assertions. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21404 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/test/unit/assertions.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb
index 0a31915bd9..c15432f058 100644
--- a/lib/test/unit/assertions.rb
+++ b/lib/test/unit/assertions.rb
@@ -92,6 +92,7 @@ module Test
def assert_no_match(regexp, string, msg=nil)
assert_instance_of(Regexp, regexp, "The first argument to assert_no_match should be a Regexp.")
+ self._assertions -= 1
msg = message(msg) { "<#{mu_pp(regexp)}> expected to not match\n<#{mu_pp(string)}>" }
assert(regexp !~ string, msg)
end