diff --git a/src/lua/swim.lua b/src/lua/swim.lua
index d3d6b01e97cb27f993506dadb232572e2f619d1f..4893d57678e493e60803fded9f157a5fa01bd4eb 100644
--- a/src/lua/swim.lua
+++ b/src/lua/swim.lua
@@ -804,6 +804,7 @@ local swim_not_configured_mt = {
__index = {
delete = swim_delete,
is_configured = swim_is_configured,
+ set_codec = swim_set_codec,
},
__serialize = swim_serialize
}
diff --git a/test/swim/box.lua b/test/swim/box.lua
index b6a39575efdf823f1889c37504a7b13be1f601d5..a603777e0bcc8355fa102bdf229d50e4430c577a 100644
--- a/test/swim/box.lua
+++ b/test/swim/box.lua
@@ -7,6 +7,28 @@ listen_port = require('uri').parse(listen_uri).service
box.cfg{}
+--
+-- SWIM instances, using broadcast, should protect themselves
+-- with encryption. Otherwise they can accidentally discover
+-- SWIM instances from other tests.
+--
+enc_key = box.info.uuid
+enc_algo = 'aes128'
+
+--
+-- Wrap swim.new with a codec to prevent test workers affecting
+-- each other.
+--
+local original_new = swim.new
+swim.new = function(...)
+ local s, err = original_new(...)
+ if s == nil then
+ return s, err
+ end
+ assert(s:set_codec({algo = enc_algo, key = enc_key, key_size = 16}))
+ return s
+end
+
function uuid(i)
local min_valid_prefix = '00000000-0000-1000-8000-'
if i < 10 then
diff --git a/test/swim/swim.result b/test/swim/swim.result
index 1b5ae2b0ffe8918ec2bb0b6b82014061c8aa0768..436d4e57929a0dfe1be2d705fe48ca1d7dcdf243 100644
--- a/test/swim/swim.result
+++ b/test/swim/swim.result
@@ -333,7 +333,7 @@ s1:delete()
s1 = swim.new({uuid = uuid(1), uri = uri()})
---
...
-s2 = swim.new({uuid = uuid(2), uri = listen_uri})
+s2 = swim.new({uuid = uuid(2), uri = uri()})
---
...
s1.probe_member()
@@ -361,7 +361,7 @@ s1:size()
---
- 1
...
-s1:probe_member(listen_uri)
+s1:probe_member(s2:self():uri())
---
- true
...
@@ -698,10 +698,10 @@ self:is_dropped()
s1 = swim.new({uuid = uuid(1), uri = uri(), heartbeat_rate = 0.01})
---
...
-s2 = swim.new({uuid = uuid(2), uri = listen_port, heartbeat_rate = 0.01})
+s2 = swim.new({uuid = uuid(2), uri = uri(), heartbeat_rate = 0.01})
---
...
-s1:add_member({uuid = uuid(2), uri = listen_port})
+s1:add_member({uuid = uuid(2), uri = s2:self():uri()})
---
- true
...
@@ -828,7 +828,7 @@ s:delete()
--
-- Payload caching.
--
-s1 = swim.new({uuid = uuid(1), uri = uri(listen_port), heartbeat_rate = 0.01})
+s1 = swim.new({uuid = uuid(1), uri = uri(), heartbeat_rate = 0.01})
---
...
s2 = swim.new({uuid = uuid(2), uri = uri(), heartbeat_rate = 0.01})
@@ -902,7 +902,7 @@ s1_view:payload()
...
s1_view:incarnation()
---
-- 2
+- 3
...
s1:cfg({heartbeat_rate = 0.01})
---
@@ -928,7 +928,7 @@ p
...
s1_view:incarnation()
---
-- 2
+- 3
...
s1:delete()
---
@@ -1099,7 +1099,7 @@ s1:set_codec(cfg)
---
- true
...
--- S2 does not use encryption and can't decode the ping.
+-- S2 uses different encryption and can't decode the ping.
s1:probe_member(s2:self():uri())
---
- true
@@ -1199,12 +1199,16 @@ s1:probe_member(s2:self():uri())
---
- true
...
-while s1:size() ~= 2 do fiber.sleep(0.01) end
+while s1:member_by_uuid(s2:self():uuid()) == nil do fiber.sleep(0.01) end
---
...
-s2:size()
+s2:member_by_uuid(s1:self():uuid())
---
-- 2
+- uri: 127.0.0.1:<port>
+ status: alive
+ incarnation: 1
+ uuid: 00000000-0000-1000-8000-000000000001
+ payload_size: 0
...
s1:delete()
---
diff --git a/test/swim/swim.test.lua b/test/swim/swim.test.lua
index b344c69be70b6d2d4b7e032f01b657ddf1d5a9bf..a3eac9b460d1fcf14cc5ba6e49688e7353885c3c 100644
--- a/test/swim/swim.test.lua
+++ b/test/swim/swim.test.lua
@@ -114,7 +114,7 @@ s1:remove_member(uuid(1))
s1:delete()
s1 = swim.new({uuid = uuid(1), uri = uri()})
-s2 = swim.new({uuid = uuid(2), uri = listen_uri})
+s2 = swim.new({uuid = uuid(2), uri = uri()})
s1.probe_member()
s1:probe_member()
s1:probe_member(true)
@@ -122,7 +122,7 @@ s1:probe_member(true)
s1:probe_member('127.0.0.1:1')
fiber.yield()
s1:size()
-s1:probe_member(listen_uri)
+s1:probe_member(s2:self():uri())
while s1:size() ~= 2 do fiber.sleep(0.01) end
s2:size()
@@ -233,8 +233,8 @@ self:is_dropped()
-- Check payload dissemination.
--
s1 = swim.new({uuid = uuid(1), uri = uri(), heartbeat_rate = 0.01})
-s2 = swim.new({uuid = uuid(2), uri = listen_port, heartbeat_rate = 0.01})
-s1:add_member({uuid = uuid(2), uri = listen_port})
+s2 = swim.new({uuid = uuid(2), uri = uri(), heartbeat_rate = 0.01})
+s1:add_member({uuid = uuid(2), uri = s2:self():uri()})
while s2:size() ~= 2 do fiber.sleep(0.01) end
s1_view = s2:member_by_uuid(uuid(1))
s1_view:payload()
@@ -269,7 +269,7 @@ s:delete()
--
-- Payload caching.
--
-s1 = swim.new({uuid = uuid(1), uri = uri(listen_port), heartbeat_rate = 0.01})
+s1 = swim.new({uuid = uuid(1), uri = uri(), heartbeat_rate = 0.01})
s2 = swim.new({uuid = uuid(2), uri = uri(), heartbeat_rate = 0.01})
s1_self = s1:self()
_ = s1:add_member({uuid = s2:self():uuid(), uri = s2:self():uri()})
@@ -371,7 +371,7 @@ cfg.key = '1234567812345678'
cfg.key_size = 16
s1:set_codec(cfg)
--- S2 does not use encryption and can't decode the ping.
+-- S2 uses different encryption and can't decode the ping.
s1:probe_member(s2:self():uri())
fiber.sleep(0.01)
s1:size()
@@ -407,8 +407,8 @@ s2:size()
s1:set_codec({algo = 'none'})
s2:set_codec({algo = 'none'})
s1:probe_member(s2:self():uri())
-while s1:size() ~= 2 do fiber.sleep(0.01) end
-s2:size()
+while s1:member_by_uuid(s2:self():uuid()) == nil do fiber.sleep(0.01) end
+s2:member_by_uuid(s1:self():uuid())
s1:delete()
s2:delete()