# # # patch "tests/common/netsync.lua" # from [9e04e633e1a8abec93b4a71d704593fa064ed935] # to [a33cf9951874259a390ad9ac0d9348893de4bac3] # # patch "tests/netsync_permissions_wildcards/__driver__.lua" # from [5bbffb56920e5888cca493016e2658898a2894f7] # to [04dbe62bca9496f4b6385d2d0e7a412b018d084d] # ============================================================ --- tests/common/netsync.lua 9e04e633e1a8abec93b4a71d704593fa064ed935 +++ tests/common/netsync.lua a33cf9951874259a390ad9ac0d9348893de4bac3 @@ -26,8 +26,13 @@ function netsync.internal.client(srv, op function netsync.internal.client(srv, oper, pat, n, res) if n == nil then n = 2 end + if n == 1 then + args = {"--rcfile=netsync.lua", "--keydir=keys", + "--db=test.db", oper, srv.address} + else args = {"--rcfile=netsync.lua", "--keydir=keys"..n, "--db=test"..n..".db", oper, srv.address} + end if type(pat) == "string" then table.insert(args, pat) elseif type(pat) == "table" then ============================================================ --- tests/netsync_permissions_wildcards/__driver__.lua 5bbffb56920e5888cca493016e2658898a2894f7 +++ tests/netsync_permissions_wildcards/__driver__.lua 04dbe62bca9496f4b6385d2d0e7a412b018d084d @@ -7,16 +7,23 @@ check(get("write-permissions")) check(get("read-permissions")) check(get("write-permissions")) -srv = netsync.start({"--confdir=."}, nil, false) +srv = netsync.start({"--confdir=."}, 2, false) -- Try pushing just one exact branch addfile("testfile1", "test file 1") commit("testbranch", "testfile") -srv:push("testbranch") +srv:push("testbranch", 1) +-- will fail if the rev wasn't synced +srv:stop() +check(mtn2("update"), 0, false, false) +srv = netsync.start({"--confdir=."}, 2, false) + -- Try pushing just branches matching a wild card addfile("testfile2", "test file 2") commit("testbranch", "testfile") -srv:push("testbra*") +srv:push("testbra*", 1) srv:stop() +check(mtn2("update"), 0, false, false) +