2c4d72f544
It depends on timing whether or not the guest shows the wait dialog between
scenarios. If the second scenario has already started when the guest tries
to show the dialog, the dialog is skipped: otherwise it's shown and it
changes the plugin context.
The join.lua plugin assumed the change of plugin context to mean that the
test is over and that the plugin should quit the game. As a result, it
ended up quitting in the middle of the test if the second scenario hadn't
started yet.
Commit 6016bdf2 tried to fix the problem by allowing the plugin context to
change once during the test. It resulted in the opposite problem: if the
second scenario *had* started, the plugin context didn't change. When the
test ended and the guest was thrown into the lobby, then the plugin
assumed that it was just the scenario change and kept waiting for the next
scenario that wasn't coming.
This commit finally fixes the problem by explicitly polling the name of the
scenario being played. Now join.lua ignores plugin context changes as long
as the last scenario hasn't started, but starts waiting for the game to end
when the scenario starts.
I verified locally that, with these changes applied, the tests pass both
with an unmodified build and with a build that has an artificial delay to
simulate the timing in Travis.
150 lines
3.6 KiB
Lua
150 lines
3.6 KiB
Lua
-- join.lua --
|
|
-- Try to join a game called "Test"
|
|
|
|
local function plugin()
|
|
|
|
local function log(text)
|
|
std_print("join: " .. text)
|
|
end
|
|
|
|
local counter = 0
|
|
|
|
local events, context, info
|
|
|
|
local helper = wesnoth.require("lua/helper.lua")
|
|
|
|
local function find_test_game(info)
|
|
local g = info.game_list()
|
|
if g then
|
|
local gamelist = helper.get_child(g, "gamelist")
|
|
if gamelist then
|
|
for i = 1, #gamelist do
|
|
local t = gamelist[i]
|
|
if t[1] == "game" then
|
|
local game = t[2]
|
|
if game.scenario == "Test" then
|
|
return game.id
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
return nil
|
|
end
|
|
|
|
local function idle_text(text)
|
|
counter = counter + 1
|
|
if counter >= 100 then
|
|
counter = 0
|
|
log("idling " .. text)
|
|
end
|
|
end
|
|
|
|
log("hello world")
|
|
|
|
repeat
|
|
events, context, info = coroutine.yield()
|
|
idle_text("in " .. info.name .. " waiting for titlescreen or lobby")
|
|
until info.name == "titlescreen" or info.name == "Multiplayer Lobby"
|
|
|
|
local tries = 0
|
|
while info.name == "titlescreen" and tries < 100 do
|
|
context.play_multiplayer({})
|
|
tries = tries + 1
|
|
log("playing multiplayer...")
|
|
events, context, info = coroutine.yield()
|
|
end
|
|
if info.name == "titlescreen" then
|
|
context.exit({code = 1})
|
|
coroutine.yield()
|
|
end
|
|
|
|
repeat
|
|
events, context, info = coroutine.yield()
|
|
idle_text("in " .. info.name .. " waiting for lobby")
|
|
until info.name == "Multiplayer Lobby"
|
|
|
|
events, context, info = coroutine.yield()
|
|
|
|
context.chat({message = "waiting for test game to join..."})
|
|
|
|
local test_game = nil
|
|
|
|
repeat
|
|
events, context, info = coroutine.yield()
|
|
idle_text("in " .. info.name .. " waiting for test game")
|
|
|
|
for i,v in ipairs(events) do
|
|
if v[1] == "chat" then
|
|
std_print("chat:", v[2].message)
|
|
end
|
|
end
|
|
|
|
test_game = find_test_game(info)
|
|
until test_game
|
|
|
|
log("found a test game, joining... id = " .. test_game)
|
|
context.chat({message = "found test game"})
|
|
context.select_game({id = test_game})
|
|
|
|
events, context, info = coroutine.yield()
|
|
|
|
context.join({})
|
|
|
|
events, context, info = coroutine.yield()
|
|
|
|
while not (info.name == "Dialog" or info.name == "Multiplayer Wait") do
|
|
if context.join then
|
|
context.join({})
|
|
else
|
|
std_print("did not find join...")
|
|
end
|
|
|
|
events, context, info = coroutine.yield()
|
|
idle_text("in " .. info.name .. " waiting for leader select dialog")
|
|
end
|
|
|
|
if info.name == "Dialog" then
|
|
log("got a leader select dialog...")
|
|
context.skip_dialog({})
|
|
events, context, info = coroutine.yield()
|
|
|
|
repeat
|
|
events, context, info = coroutine.yield()
|
|
idle_text("in " .. info.name .. " waiting for mp wait")
|
|
until info.name == "Multiplayer Wait"
|
|
end
|
|
|
|
log("got to multiplayer wait...")
|
|
context.chat({message = "ready"})
|
|
|
|
repeat
|
|
events, context, info = coroutine.yield()
|
|
idle_text("in " .. info.name .. " waiting for game")
|
|
until info.name == "Game"
|
|
|
|
log("got to a game context...")
|
|
|
|
repeat
|
|
events, context, info = coroutine.yield()
|
|
idle_text("in " .. info.name .. " waiting for the last scenario")
|
|
until info.scenario_name ~= nil and info.scenario_name().scenario_name == "Multiplayer Unit Test test2"
|
|
|
|
repeat
|
|
events, context, info = coroutine.yield()
|
|
idle_text("in " .. info.name .. " waiting for not game")
|
|
until info.name ~= "Game"
|
|
|
|
log("left a game context...")
|
|
|
|
repeat
|
|
context.quit({})
|
|
log("quitting a " .. info.name .. " context...")
|
|
events, context, info = coroutine.yield()
|
|
until info.name == "titlescreen"
|
|
|
|
context.exit({code = 0})
|
|
coroutine.yield()
|
|
end
|
|
|
|
return plugin
|