Merge lp:~widelands-dev/widelands/bug-1825486-inputqueue-test2 into lp:widelands

Proposed by GunChleoc
Status: Merged
Merged at revision: 9159
Proposed branch: lp:~widelands-dev/widelands/bug-1825486-inputqueue-test2
Merge into: lp:widelands
Diff against target: 12 lines (+2/-1)
1 file modified
test/maps/plain.wmf/scripting/test_inputqueues.lua (+2/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1825486-inputqueue-test2
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+369238@code.launchpad.net

Commit message

Wait longer in test_inputqueues.lua after stable_save

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 5232. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/549670864.
Appveyor build 5011. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1825486_inputqueue_test2-5011.

Revision history for this message
GunChleoc (gunchleoc) wrote :

This version of my fix attempts has run successfully twice, so I'll go ahead and merge it.

I tried implementing an indicator into the save handler, but that does not work, because the test suite will reset the state before loading.

Travis failure is a temporary package downloading network issue for Mac

@bunnybot merge force

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test/maps/plain.wmf/scripting/test_inputqueues.lua'
2--- test/maps/plain.wmf/scripting/test_inputqueues.lua 2018-10-27 09:45:14 +0000
3+++ test/maps/plain.wmf/scripting/test_inputqueues.lua 2019-06-24 10:23:26 +0000
4@@ -47,7 +47,8 @@
5 assert_all_queues_are_full(b)
6
7 stable_save(game, "inputqueues")
8- sleep(1000)
9+ -- If we don't sleep long enough, this test can stall.
10+ sleep(10 * game.desired_speed)
11
12 assert_all_queues_are_full(b)
13

Subscribers

People subscribed via source and target branches

to status/vote changes: