Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixing intermittent test

This commit is contained in:
Enno Rehling 2012-07-09 08:28:08 +02:00
parent f33226947d
commit 64658bd260
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eressea

@ -1 +1 @@
Subproject commit 366f0feeaa27d48dde66d85854902120f6296326 Subproject commit 5abfaad5281c82686ade64dc181a7aade5380de1

16
scripts/tests/e3a.lua
View File

@ -74,7 +74,6 @@ function test_seecast()
u1:clear_orders() u1:clear_orders()
u1:add_order("NACH O O O O") u1:add_order("NACH O O O O")
process_orders() process_orders()
write_reports()
assert_equal(8, u2.region.x) assert_equal(8, u2.region.x)
end end
@ -135,6 +134,8 @@ function test_fishing()
end end
function test_ship_capacity() function test_ship_capacity()
eressea.settings.set("rules.ship.drifting", "0")
eressea.settings.set("rules.ship.storms", "0")
local r = region.create(0,0, "ocean") local r = region.create(0,0, "ocean")
region.create(1,0, "ocean") region.create(1,0, "ocean")
local r2 = region.create(2,0, "ocean") local r2 = region.create(2,0, "ocean")
@ -178,10 +179,14 @@ function test_ship_capacity()
update_owners() update_owners()
process_orders() process_orders()
assert_equal(r2.id, u1.region.id) assert_equal(r2, u1.region)
assert_not_equal(r2.id, u2.region.id) assert_not_equal(r2, u2.region)
assert_equal(r2.id, u3.region.id) if r2~=u3.region then
assert_not_equal(r2.id, u4.region.id) print(get_turn(), u3, u3.faction)
write_reports()
end
assert_equal(r2, u3.region)
assert_not_equal(r2, u4.region)
end end
function test_owners() function test_owners()
@ -644,6 +649,7 @@ function test_p2_move()
u:add_item("horse", 1) u:add_item("horse", 1)
u:add_item("p2", 1) u:add_item("p2", 1)
u:add_item("log", 1) u:add_item("log", 1)
u:add_item("mallorn", 1)
process_orders() process_orders()
assert_equal(1, u.region.x) assert_equal(1, u.region.x)
assert_equal(1, r:get_resource("tree")) assert_equal(1, r:get_resource("tree"))