aboutsummaryrefslogtreecommitdiffstats
path: root/basictest
diff options
context:
space:
mode:
authorJeremy Evans <code@jeremyevans.net>2020-06-10 18:53:25 -0700
committerJeremy Evans <code@jeremyevans.net>2020-06-18 08:21:29 -0700
commit95dc9c07f3a895f45cfb5dab235cd78f157a9e51 (patch)
treec5ed4ca00c1700b1c4aa1cea958bb4767acd1ecf /basictest
parentaae8223c7076483f1f1641181088790b2f3a66dd (diff)
downloadruby-95dc9c07f3a895f45cfb5dab235cd78f157a9e51.tar.gz
Raise RuntimeError for class variable overtaken in nonverbose mode
900e83b50115afda3f79712310e4cb95e4508972 changed from a warning to an error in this case, but the warning was only issued in verbose mode, and therefore the error was only raised in verbose mode. That was not intentional, verbose mode should only change whether warnings are emitted, not other behavior. This issues the RuntimeError in all cases. This change broke a couple tests, as the tests actually issued the warning and therefore now raise an error. This wasn't caught earlier as test_variable suppressed the warning in this case, effectively setting $VERBOSE = false around the code that warned. basictest isn't run in verbose mode and therefore didn't expose the issue previously. Fix these tests. Fixes [Bug #14541]
Diffstat (limited to 'basictest')
-rwxr-xr-xbasictest/test.rb13
1 files changed, 10 insertions, 3 deletions
diff --git a/basictest/test.rb b/basictest/test.rb
index a2eb107bce..52008b78db 100755
--- a/basictest/test.rb
+++ b/basictest/test.rb
@@ -2137,7 +2137,7 @@ $_ = foobar
test_ok($_ == foobar)
class Gods
- @@rule = "Uranus" # private to Gods
+ @@rule = "Uranus"
def ruler0
@@rule
end
@@ -2160,7 +2160,7 @@ module Olympians
end
class Titans < Gods
- @@rule = "Cronus" # do not affect @@rule in Gods
+ @@rule = "Cronus" # modifies @@rule in Gods
include Olympians
def ruler4
@@rule
@@ -2175,7 +2175,14 @@ test_ok(Titans.ruler2 == "Cronus")
atlas = Titans.new
test_ok(atlas.ruler0 == "Cronus")
test_ok(atlas.ruler3 == "Zeus")
-test_ok(atlas.ruler4 == "Cronus")
+begin
+ atlas.ruler4
+rescue RuntimeError => e
+ test_ok(e.message.include?("class variable @@rule of Olympians is overtaken by Gods"))
+else
+ test_ok(false)
+end
+test_ok(atlas.ruler3 == "Zeus")
test_check "trace"
$x = 1234