Tests modified to match the new global protection implementation.

diff --git a/tests/unit/scripting.tcl b/tests/unit/scripting.tcl
index 091b4c430df2959fedb9fb5dee8277c749c06fe8..a9aae7b8c652f757ef5902f38f1bfb79b1e25c95 100644 (file)
--- a/tests/unit/scripting.tcl
+++ b/tests/unit/scripting.tcl
@@ -223,39 +223,12 @@ start_server {tags {"scripting"}} {
     test {Globals protection reading an undeclared global variable} {
         catch {r eval {return a} 0} e
         set e
-    } {*ERR*global variable*not declared*}
+    } {*ERR*attempted to access unexisting global*}
 
-    test {Globals protection setting an undeclared global variable} {
+    test {Globals protection setting an undeclared global*} {
         catch {r eval {a=10} 0} e
         set e
-    } {*ERR*assignment to undeclared*}
-
-    test {Globals protection bypassed using 'global' function} {
-        catch {r eval {global("a"); a=10; return a} 0} e
-        set e
-    } {10}
-
-    test {Globals protection can be disabled} {
-        r config set lua-protect-globals no
-        catch {r eval {b=20; return b} 0} e
-        set e
-    } {20}
-
-    test {Globals protection can be re-enabled} {
-        r config set lua-protect-globals yes
-        catch {r eval {c=30; return c} 0} e
-        set e
-    } {*ERR*assignment to undeclared*}
-
-    test {Globals protection 'global' function works with mutliple args} {
-        catch {r eval {
-            global("var1","var2")
-            var1=10
-            var2=20
-            return {var1,var2}
-        } 0 } e
-        set e
-    } {10 20}
+    } {*ERR*attempted to create global*}
 }
 
 start_server {tags {"scripting repl"}} {