diff options
| author | Kim Alvefur <zash@zash.se> | 2016-07-08 22:01:10 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-07-08 22:01:10 +0200 |
| commit | c14840340a365a79517ff455b3e84d25ef62c159 (patch) | |
| tree | e5339d0c057334591e52af0777588890d51081a5 /tests | |
| parent | 01e9c0fcaece58c4b70ffcb2e6f3df8e15f03f7b (diff) | |
| parent | c53e625e427b1197b45ac9bbdf192cb07c6f2285 (diff) | |
| download | prosody-c14840340a365a79517ff455b3e84d25ef62c159.tar.gz prosody-c14840340a365a79517ff455b3e84d25ef62c159.zip | |
Merge 0.10->trunk
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_util_jid.lua | 2 | ||||
| -rw-r--r-- | tests/test_util_multitable.lua | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/test_util_jid.lua b/tests/test_util_jid.lua index c697e63f..0ac5827e 100644 --- a/tests/test_util_jid.lua +++ b/tests/test_util_jid.lua @@ -19,7 +19,7 @@ end function split(split) - function test(input_jid, expected_node, expected_server, expected_resource) + local function test(input_jid, expected_node, expected_server, expected_resource) local rnode, rserver, rresource = split(input_jid); assert_equal(expected_node, rnode, "split("..tostring(input_jid)..") failed"); assert_equal(expected_server, rserver, "split("..tostring(input_jid)..") failed"); diff --git a/tests/test_util_multitable.lua b/tests/test_util_multitable.lua index 71a83450..4a8dd14c 100644 --- a/tests/test_util_multitable.lua +++ b/tests/test_util_multitable.lua @@ -8,7 +8,7 @@ function new(new, multitable) - mt = new(); + local mt = new(); assert_table(mt, "Multitable is a table"); assert_function(mt.add, "Multitable has method add"); assert_function(mt.get, "Multitable has method get"); @@ -40,7 +40,7 @@ function get(get, multitable) return assert_equal(select(2, has_items(list, ...)), "has-all", message or "List has all expected items, and no more", 2); end - mt = multitable.new(); + local mt = multitable.new(); local trigger1, trigger2, trigger3 = {}, {}, {}; local item1, item2, item3 = {}, {}, {}; |