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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21404 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index a8170b3e3..d8e5b953d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan  8 00:31:58 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/test/unit/assertions.rb (assert_no_match): don't count up as two
+	  assertions.
+
 Mon Jan  5 12:52:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/win32.c (init_env): use user profile folder than personal
diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb
index 0a31915bd..c15432f05 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