# # # patch "lua-testsuite.lua" # from [8c51a64689214ff32e375383879a1e921da58497] # to [f023bf17b18eda1376750b8d1f3a40811f2fe0c8] # # patch "tests/(imp)_persistent_netsync_server_-_keys_2/__driver__.lua" # from [ced4ffc5130603ac1b82c144554a67f73308dbec] # to [eadb42cd08f956babf87637d58a073b97296506a] # ============================================================ --- lua-testsuite.lua 8c51a64689214ff32e375383879a1e921da58497 +++ lua-testsuite.lua f023bf17b18eda1376750b8d1f3a40811f2fe0c8 @@ -16,9 +16,9 @@ function safe_mtn(...) if testsuite_use_ws then -- FIXME: need to store confdir in _MTN/options - return {monotone_path, "--norc", unpack(arg)} + return {monotone_path, "--ssh-sign=no", "--norc", unpack(arg)} else - return {monotone_path, "--norc", "--root=" .. test.root, + return {monotone_path, "--ssh-sign=no", "--norc", "--root=" .. test.root, "--confdir="..test.root, unpack(arg)} end end ============================================================ --- tests/(imp)_persistent_netsync_server_-_keys_2/__driver__.lua ced4ffc5130603ac1b82c144554a67f73308dbec +++ tests/(imp)_persistent_netsync_server_-_keys_2/__driver__.lua eadb42cd08f956babf87637d58a073b97296506a @@ -24,8 +24,8 @@ srv = netsync.start() check(mtn2("commit", "address@hidden", "--branch=testbranch", "-m", 'commit foo'), 0, false, false) srv = netsync.start() -srv:push("testbranch", 2) -srv:pull("testbranch", 3) +srv:push({"testbranch", "--ticker=dot"}, 2) +srv:pull({"testbranch", "address@hidden", "--ticker=dot"}, 3) srv:finish() check(mtn3("ls", "keys"), 0, true, false)