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

reset turn to 0 before and after each test. 

save tests that depend on the global turn variable would fail when being run out of order.
this cause issue #560
This commit is contained in:
Enno Rehling 2016-09-08 19:48:36 +02:00
parent a281ace21b
commit ab876431de
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/kernel/save.c
View File

@ -623,12 +623,14 @@ static void write_owner(struct gamedata *data, region_owner * owner)
if (owner) { if (owner) {
faction *f; faction *f;
WRITE_INT(data->store, owner->since_turn); WRITE_INT(data->store, owner->since_turn);
WRITE_INT(data->store, owner->morale_turn); if (owner->since_turn >= 0) {
WRITE_INT(data->store, owner->flags); WRITE_INT(data->store, owner->morale_turn);
f = owner->last_owner; WRITE_INT(data->store, owner->flags);
write_faction_reference((f && f->_alive) ? f : NULL, data->store); f = owner->last_owner;
f = owner->owner; write_faction_reference((f && f->_alive) ? f : NULL, data->store);
write_faction_reference((f && f->_alive) ? f : NULL, data->store); f = owner->owner;
write_faction_reference((f && f->_alive) ? f : NULL, data->store);
}
} }
else { else {
WRITE_INT(data->store, -1); WRITE_INT(data->store, -1);

2
src/kernel/save.test.c
View File

@ -162,7 +162,7 @@ static void test_readwrite_dead_faction_regionowner(CuTest *tc) {
config_set("rules.region_owners", "1"); config_set("rules.region_owners", "1");
f = test_create_faction(0); f = test_create_faction(0);
test_create_unit(f, r = test_create_region(0, 0, 0)); test_create_unit(f, r = test_create_region(0, 0, 0));
region_set_owner(r, f, turn); region_set_owner(r, f, 0);
destroyfaction(&factions); destroyfaction(&factions);
CuAssertTrue(tc, !f->_alive); CuAssertTrue(tc, !f->_alive);
remove_empty_units(); remove_empty_units();

1
src/tests.c
View File

@ -161,6 +161,7 @@ void test_log_stderr(int flags) {
static void test_reset(void) { static void test_reset(void) {
int i; int i;
turn = 0;
default_locale = 0; default_locale = 0;
free_gamedata(); free_gamedata();
free_terrains(); free_terrains();