diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-14 06:07:39 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-14 06:07:39 +0000 |
| commit | 83f1aca178bbcd9a9e25be49288c571fe8419a47 (patch) | |
| tree | ee37cb89be7d04fa83687bfd75ed13ddb202f8c8 /lib | |
| parent | e782ca865b3353870fd0fe5f45709c4997366d1a (diff) | |
merge revision(s) 34589:
* lib/test/unit/assertions.rb (build_message): skip escaped
question marks.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34590 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/test/unit/assertions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb index 19d88d09c7..695a5ef3ca 100644 --- a/lib/test/unit/assertions.rb +++ b/lib/test/unit/assertions.rb @@ -265,7 +265,7 @@ EOT def build_message(head, template=nil, *arguments) #:nodoc: template &&= template.chomp - template.gsub(/\?/) { mu_pp(arguments.shift) } + template.gsub(/\G((?:[^\\]|\\.)*?)(\\)?\?/) { $1 + ($2 ? "?" : mu_pp(arguments.shift)) } end end end |