Commit cc33d610 authored by Levin Zimmermann's avatar Levin Zimmermann Committed by Kirill Smelkov

lib/tests: Fix flaky zstor_2zurl test

Kirill noted that fb620301 introduced a regression [1]:
'test_zstor_2zurl' sometimes passes and sometimes fails. The reason for
this is that there is no deterministic order of master nodes in
'NodeManager.getMasterList()', which is why there is no specified
order of master node addresses in a zurl [2]. We don't want to normalize
a zurl returned by 'zstor_2zurl' as we need some of the client-specific
parameters as SSL file paths, so we rather fix the test to allow any
possible order of NEO master nodes in the zurl.

[1] !17 (comment 188102)

/reviewed-by @kirr
/reviewed-on !17
parent fb620301
......@@ -505,9 +505,9 @@ def test_zstor_2zurl(tmpdir, neo_ssl_dict):
# assert_zurl_is_correct verifies that zstor_2zurl(zstor) returns zurl_ok.
# zstor is closed after this test.
def assert_zurl_is_correct(zstor, zurl_ok):
def assert_zurl_is_correct(zstor, *zurl_ok):
assert zstor_2zurl(zstor) == zurl_ok
assert zstor_2zurl(zstor) in zurl_ok
# sslp is the ssl encryption uri part of an encrypted NEO node
q = quote_plus
......@@ -525,7 +525,9 @@ def test_zstor_2zurl(tmpdir, neo_ssl_dict):
_(neo("test", "", 1), "neos://%s@" % sslp) # + ssl
_(neo("test", "[::1]:1234"), "neo://[::1]:1234/test") # NEO/ip6
_(neo("test", "[::1]:1234", 1), "neos://%s@[::1]:1234/test" % sslp) # + ssl
_(neo("test", "[::1]:1234\n[::2]:1234"), "neo://[::1]:1234,[::2]:1234/test") # + 2 master nodes
_(neo("test", "[::1]:1234\n[::2]:1234"), # + 2 master nodes
# Master order is not specified, so we have 2 possible/acceptable zurl
"neo://[::1]:1234,[::2]:1234/test", "neo://[::2]:1234,[::1]:1234/test")
_(demo(zeo("base", ("", 5)), # DemoStorage
fs1("delta.fs")), "demo:(zeo://" % tmpdir)
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment