widelands-dev team mailing list archive

[Tino <tino.miegel@xxxxxxxxxxxxxx>]

Tino has proposed merging lp:~widelands-dev/widelands/test_for_bug1332856 into lp:~qcumber-some/widelands/bug1332856.

Requested reviews:
  Jens Beyer (qcumber-some)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/test_for_bug1332856/+merge/224048

completes the regression test, wait some time and then archive messages one by one to force rendering.
-- 
https://code.launchpad.net/~widelands-dev/widelands/test_for_bug1332856/+merge/224048
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/test_for_bug1332856.

=== renamed file 'test/maps/plain.wmf/binary/resource' => 'test/maps/plain.wmf/binary/resource.OTHER'
Binary files test/maps/plain.wmf/binary/resource	2014-06-22 17:09:42 +0000 and test/maps/plain.wmf/binary/resource.OTHER	2014-06-22 17:57:14 +0000 differ
=== renamed file 'test/maps/plain.wmf/binary/terrain' => 'test/maps/plain.wmf/binary/terrain.OTHER'
Binary files test/maps/plain.wmf/binary/terrain	2014-06-22 17:09:42 +0000 and test/maps/plain.wmf/binary/terrain.OTHER	2014-06-22 17:57:14 +0000 differ
=== modified file 'test/maps/plain.wmf/elemental'
--- test/maps/plain.wmf/elemental	2014-06-22 17:09:42 +0000
+++ test/maps/plain.wmf/elemental	2014-06-22 17:57:14 +0000
@@ -1,4 +1,8 @@
+<<<<<<< TREE
 # Automatically created by Widelands bzr6998[widelands] (Debug)
+=======
+# Automatically created by Widelands bzr6996[widelands] (Debug)
+>>>>>>> MERGE-SOURCE
 
 [global]
 packet_version="1"

=== modified file 'test/maps/plain.wmf/extra_data'
--- test/maps/plain.wmf/extra_data	2014-06-22 17:09:42 +0000
+++ test/maps/plain.wmf/extra_data	2014-06-22 17:57:14 +0000
@@ -1,4 +1,8 @@
+<<<<<<< TREE
 # Automatically created by Widelands bzr6998[widelands] (Debug)
+=======
+# Automatically created by Widelands bzr6996[widelands] (Debug)
+>>>>>>> MERGE-SOURCE
 
 [global]
 packet_version="1"

=== modified file 'test/maps/plain.wmf/objective'
--- test/maps/plain.wmf/objective	2014-06-22 17:09:42 +0000
+++ test/maps/plain.wmf/objective	2014-06-22 17:57:14 +0000
@@ -1,4 +1,8 @@
+<<<<<<< TREE
 # Automatically created by Widelands bzr6998[widelands] (Debug)
+=======
+# Automatically created by Widelands bzr6996[widelands] (Debug)
+>>>>>>> MERGE-SOURCE
 
 [global]
 packet_version="2"

=== modified file 'test/maps/plain.wmf/player_names'
--- test/maps/plain.wmf/player_names	2014-06-22 17:09:42 +0000
+++ test/maps/plain.wmf/player_names	2014-06-22 17:57:14 +0000
@@ -1,4 +1,8 @@
+<<<<<<< TREE
 # Automatically created by Widelands bzr6998[widelands] (Debug)
+=======
+# Automatically created by Widelands bzr6996[widelands] (Debug)
+>>>>>>> MERGE-SOURCE
 
 [global]
 packet_version="2"

=== modified file 'test/maps/plain.wmf/player_position'
--- test/maps/plain.wmf/player_position	2014-06-22 17:09:42 +0000
+++ test/maps/plain.wmf/player_position	2014-06-22 17:57:14 +0000
@@ -1,4 +1,8 @@
+<<<<<<< TREE
 # Automatically created by Widelands bzr6998[widelands] (Debug)
+=======
+# Automatically created by Widelands bzr6996[widelands] (Debug)
+>>>>>>> MERGE-SOURCE
 
 [global]
 packet_version="2"

=== modified file 'test/maps/plain.wmf/port_spaces'
--- test/maps/plain.wmf/port_spaces	2014-06-22 17:09:42 +0000
+++ test/maps/plain.wmf/port_spaces	2014-06-22 17:57:14 +0000
@@ -1,4 +1,8 @@
+<<<<<<< TREE
 # Automatically created by Widelands bzr6998[widelands] (Debug)
+=======
+# Automatically created by Widelands bzr6996[widelands] (Debug)
+>>>>>>> MERGE-SOURCE
 
 [global]
 packet_version="1"

=== modified file 'test/maps/plain.wmf/scripting/test_fires_do_not_burn_forever.lua'
--- test/maps/plain.wmf/scripting/test_fires_do_not_burn_forever.lua	2014-06-20 14:38:48 +0000
+++ test/maps/plain.wmf/scripting/test_fires_do_not_burn_forever.lua	2014-06-22 17:57:14 +0000
@@ -2,7 +2,7 @@
    sleep(5000)
 
    map:get_field(10, 10).immovable:destroy()
-   sleep(120000)
+   sleep(1200000)
    local imm = map:get_field(10, 10).immovable
    if imm ~= nil then
       assert_not_equal("destroyed_building", imm.name)

=== modified file 'test/maps/plain.wmf/scripting/test_geologist_messages_do_not_crash.lua'
--- test/maps/plain.wmf/scripting/test_geologist_messages_do_not_crash.lua	2014-06-22 17:09:42 +0000
+++ test/maps/plain.wmf/scripting/test_geologist_messages_do_not_crash.lua	2014-06-22 17:57:14 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 run(function()
    sleep(5000)
 
@@ -35,3 +36,46 @@
    print("# All Tests passed.")
    wl.ui.MapView():close()
 end)
+=======
+run(function()
+   sleep(1000)
+
+   assert_equal(1, #p1:get_buildings("headquarters"))
+
+   local hqs = p1:get_buildings("headquarters")
+   local hq = hqs[1]
+   local fhq = hq.flag
+   hq:set_workers("geologist", 2)
+
+   local field = map:get_field(26,24)
+   local flag = p1:place_flag(field)
+   local road = p1:place_road(flag, "bl", "bl", "l", "l")
+   sleep(1000)
+
+   local mv = wl.ui.MapView()
+   mv:click(field)
+   sleep(1000)
+
+   mv.windows.field_action.buttons.geologist:click()
+   sleep(1000)
+
+   local field2 = map:get_field(23,23)
+   local flag2 = p1:place_flag(field2)
+   local road2 = p1:place_road(flag2, "br", "bl", "bl")
+   sleep(1000)
+
+   mv:click(field2)
+   sleep(1000)
+
+   mv.windows.field_action.buttons.geologist:click()
+   sleep(500000)
+   click_button("messages")
+   for i=1,10 do 
+       sleep(50000)
+      click_button("archive_or_restore_selected_messages") 
+   end
+
+   print("# All Tests passed.")
+   wl.ui.MapView():close()
+end)
+>>>>>>> MERGE-SOURCE

=== modified file 'test/maps/plain.wmf/version'
--- test/maps/plain.wmf/version	2014-06-22 17:09:42 +0000
+++ test/maps/plain.wmf/version	2014-06-22 17:57:14 +0000
@@ -1,11 +1,20 @@
+<<<<<<< TREE
 # Automatically created by Widelands bzr6998[widelands] (Debug)
+=======
+# Automatically created by Widelands bzr6996[widelands] (Debug)
+>>>>>>> MERGE-SOURCE
 
 [global]
 map_source_url=
 map_release=
 map_creator_version="bzr6991[trunk]"
 map_version_major="0"
+<<<<<<< TREE
 map_version_minor="3"
 map_version_timestamp="1403455628"
+=======
+map_version_minor="2"
+map_version_timestamp="1403441364"
+>>>>>>> MERGE-SOURCE
 packet_version="1"
 packet_compatibility="1"