# # # patch "tests/common/netsync.lua" # from [85fc59f8cff3a9e95641c9ffcddcf265dea4ddfd] # to [2a0b34f969dc8806e497e2ec53231dfe84111e6d] # # patch "tests/netsync_default_server_pattern/__driver__.lua" # from [7b985e60eade5c3978e7ca9c1a01c0dd07718674] # to [bb1a0015b7f492d894d80f9041855898ba972781] # ============================================================ --- tests/common/netsync.lua 85fc59f8cff3a9e95641c9ffcddcf265dea4ddfd +++ tests/common/netsync.lua 2a0b34f969dc8806e497e2ec53231dfe84111e6d @@ -83,6 +83,7 @@ function netsync.start(opts, n, min) local argv = fn(unpack(args)) local out = bg(argv, false, false, false) out.address = addr + out.url = "mtn://" .. addr out.argv = argv local mt = getmetatable(out) mt.client = netsync.internal.client ============================================================ --- tests/netsync_default_server_pattern/__driver__.lua 7b985e60eade5c3978e7ca9c1a01c0dd07718674 +++ tests/netsync_default_server_pattern/__driver__.lua bb1a0015b7f492d894d80f9041855898ba972781 @@ -29,16 +29,16 @@ check(mtn2("set", "database", "default-i -- Now make sure explicit server with default pattern works... check(mtn2("set", "database", "default-server", "nonsense"), 0, false, false) check(mtn2("set", "database", "default-include-pattern", "otherbranch"), 0, false, false) -check(mtn2("unset", "server-include", srv.address), 0, false, false) +check(mtn2("unset", "server-include", srv.url), 0, false, false) srv:pull() check(mtn2("checkout", "--branch=otherbranch", "--revision", revs.otherbranch, "testdir2"), 0, false, false) check(exists("testdir2/testfile")) -- And finally, make sure that passing nothing at all also works (uses default) -check(mtn2("set", "database", "default-server", srv.address), 0, false, false) +check(mtn2("set", "database", "default-server", srv.url), 0, false, false) check(mtn2("set", "database", "default-include-pattern", "thirdbranch"), 0, false, false) -check(mtn2("unset", "server-include", srv.address), 0, false, false) +check(mtn2("unset", "server-include", srv.url), 0, false, false) check(mtn2("sync"), 0, false, false) check(mtn2("checkout", "--branch=thirdbranch", "--revision", revs.thirdbranch, "testdir3"), 0, false, false)