aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-08-26 03:39:21 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-08-26 03:39:21 +0000
commitab0fe78f033e92182d41b10a2f46f1a744a5df56 (patch)
treee059bf11e5fbedd93a7b957ab9a01f5d84db729b
parent1f48a3382b41d3e30d020f179147a063ce4fa4ba (diff)
downloadruby-ab0fe78f033e92182d41b10a2f46f1a744a5df56.tar.gz
* test/test_mathn.rb: added workaround for VERBOSE messages.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--test/test_mathn.rb16
2 files changed, 13 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index f4cffb581c..dfea2524e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Aug 26 12:38:02 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+
+ * test/test_mathn.rb: added workaround for VERBOSE messages.
+
Tue Aug 26 11:44:04 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* lib/shell/process-controller.rb: removed commented-out code.
diff --git a/test/test_mathn.rb b/test/test_mathn.rb
index e9a2c4c5ba..bbb88517cf 100644
--- a/test/test_mathn.rb
+++ b/test/test_mathn.rb
@@ -4,20 +4,22 @@ require_relative 'ruby/envutil'
# mathn redefines too much. It must be isolated to child processes.
class TestMathn < Test::Unit::TestCase
def test_power
- assert_in_out_err ['-r', 'mathn', '-e', 'a=1**2;!a'], "", [], [], '[ruby-core:25740]'
- assert_in_out_err ['-r', 'mathn', '-e', 'a=(1 << 126)**2;!a'], "", [], [], '[ruby-core:25740]'
+ stderr = $VERBOSE ? ["lib/mathn.rb is deprecated"] : []
+ assert_in_out_err ['-r', 'mathn', '-e', 'a=1**2;!a'], "", [], stderr, '[ruby-core:25740]'
+ assert_in_out_err ['-r', 'mathn', '-e', 'a=(1 << 126)**2;!a'], "", [], stderr, '[ruby-core:25740]'
assert_in_out_err ['-r', 'mathn/complex', '-e', 'a=Complex(0,1)**4;!a'], "", [], [], '[ruby-core:44170]'
assert_in_out_err ['-r', 'mathn/complex', '-e', 'a=Complex(0,1)**5;!a'], "", [], [], '[ruby-core:44170]'
end
def test_quo
- assert_in_out_err ['-r', 'mathn'], <<-EOS, %w(OK), [], '[ruby-core:41575]'
+ stderr = $VERBOSE ? ["lib/mathn.rb is deprecated"] : []
+ assert_in_out_err ['-r', 'mathn'], <<-EOS, %w(OK), stderr, '[ruby-core:41575]'
1.quo(2); puts :OK
EOS
end
def test_floor
- assert_separately(%w[-rmathn], <<-EOS)
+ assert_separately(%w[-rmathn], <<-EOS, ignore_stderr: true)
assert_equal( 2, ( 13/5).floor)
assert_equal( 2, ( 5/2).floor)
assert_equal( 2, ( 12/5).floor)
@@ -42,7 +44,7 @@ class TestMathn < Test::Unit::TestCase
end
def test_ceil
- assert_separately(%w[-rmathn], <<-EOS)
+ assert_separately(%w[-rmathn], <<-EOS, ignore_stderr: true)
assert_equal( 3, ( 13/5).ceil)
assert_equal( 3, ( 5/2).ceil)
assert_equal( 3, ( 12/5).ceil)
@@ -67,7 +69,7 @@ class TestMathn < Test::Unit::TestCase
end
def test_truncate
- assert_separately(%w[-rmathn], <<-EOS)
+ assert_separately(%w[-rmathn], <<-EOS, ignore_stderr: true)
assert_equal( 2, ( 13/5).truncate)
assert_equal( 2, ( 5/2).truncate)
assert_equal( 2, ( 12/5).truncate)
@@ -92,7 +94,7 @@ class TestMathn < Test::Unit::TestCase
end
def test_round
- assert_separately(%w[-rmathn], <<-EOS)
+ assert_separately(%w[-rmathn], <<-EOS, ignore_stderr: true)
assert_equal( 3, ( 13/5).round)
assert_equal( 3, ( 5/2).round)
assert_equal( 2, ( 12/5).round)