Merge lp:~widelands-dev/widelands/bug-1786597-test-suite into lp:widelands

[GunChleoc]

Fix the testsuite for carriers

This should unbreak the test suite

[ypopezios (ypopezios)]

Inline comment.
Also, if you haven't done it, check this comment:
https://bugs.launchpad.net/widelands/+bug/1535115/comments/33

[GunChleoc (gunchleoc)]

Oops... fixed!

If this code sufficient or will it barf it the carrier is in init rather than wait? I don't care much about 100% correctness for the saveloading at this point.

I am working on a follow-up branch and use an enum class for the states. Working on that has flagged up lots of hard-coded and fragile stuff from old code.

[ypopezios (ypopezios)]

In current problematic design, a carrier in an invalid state can easily get stuck, so we will need to test some actual savegames to answer that.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3770. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/414860025.
Appveyor build 3569. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1786597_test_suite-3569.

[GunChleoc (gunchleoc)]

I tried to add https://bugs.launchpad.net/widelands/+bug/1535115/comments/33 into the compatibility code but it broke the test suite again, so I used the branch to update the mapobjectpacket in the problematic test scenario and removed the savegame compatibility.

[ypopezios (ypopezios)]

Does this end this branch' reason of existence?

review: Needs Information

[GunChleoc (gunchleoc)]

No, it will fix the test suite. See the changes to the binary file on he bottom ;)

[ypopezios (ypopezios)]

As far as it concerns me, this looks ok ;-P

review: Approve

[GunChleoc (gunchleoc)]

Thanks for the review! :)

@bunnybot merge

[GunChleoc (gunchleoc)]

Transient error on Travis

@bunnybot merge force

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3780. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/415308939.
Appveyor build 3579. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1786597_test_suite-3579.

[bunnybot (widelandsofficial)]

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 3780. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/415308939.

[GunChleoc (gunchleoc)]

@bunnybot merge force

=== modified file 'src/logic/map_objects/tribes/carrier.cc'
--- src/logic/map_objects/tribes/carrier.cc	2018-08-09 11:11:15 +0000
+++ src/logic/map_objects/tribes/carrier.cc	2018-08-13 05:51:48 +0000
@@ -421,7 +421,6 @@
 
 ==============================
 */
-
 constexpr uint8_t kCurrentPacketVersion = 2;
 
 Carrier::Loader::Loader() {
@@ -431,7 +430,6 @@
 	Worker::Loader::load(fr);
 
 	try {
-
 		uint8_t packet_version = fr.unsigned_8();
 		if (packet_version == kCurrentPacketVersion) {
 			Carrier& carrier = get<Carrier>();

=== modified file 'test/maps/lua_testsuite.wmf/binary/mapobjects'
Binary files test/maps/lua_testsuite.wmf/binary/mapobjects	2018-07-13 10:35:16 +0000 and test/maps/lua_testsuite.wmf/binary/mapobjects	2018-08-13 05:51:48 +0000 differ