From caf239b3ed36f356028a80a067fa64d62b2bbb52 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 14 Jan 2014 21:48:38 +0100 Subject: [PATCH] tests: Zap setup's news and lost items, like telegrams Signed-off-by: Markus Armbruster --- tests/actofgod/final.xdump | 7 ------- tests/fire/final.xdump | 6 ------ tests/test-common.sh | 4 ++++ 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/tests/actofgod/final.xdump b/tests/actofgod/final.xdump index 4afbadc5..49482053 100644 --- a/tests/actofgod/final.xdump +++ b/tests/actofgod/final.xdump @@ -407,13 +407,6 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius stockpile p /config config news actor action victim times duration time -0 43 1 39 0 0 -0 43 2 38 0 0 -0 43 3 46 0 0 -0 42 3 49 0 0 -0 42 2 38 0 0 -0 42 1 39 0 0 -0 44 3 1 0 0 0 44 1 32 0 0 0 43 2 6 0 0 0 44 3 28 0 0 diff --git a/tests/fire/final.xdump b/tests/fire/final.xdump index 99047ad2..adf6d498 100644 --- a/tests/fire/final.xdump +++ b/tests/fire/final.xdump @@ -590,12 +590,6 @@ uid owner type amount price maxbidder markettime xbuy ybuy xsell ysell /config config lost timestamp owner type id x y -0 98 1 0 0 0 -0 98 2 0 0 0 -0 98 3 0 0 0 -0 98 4 0 0 0 -0 98 0 0 0 0 -0 1 0 0 1 3 0 2 3 30 1 3 0 2 2 30 1 3 0 2 3 31 1 3 diff --git a/tests/test-common.sh b/tests/test-common.sh index ff009894..9b68997c 100644 --- a/tests/test-common.sh +++ b/tests/test-common.sh @@ -145,6 +145,10 @@ begin_test() stop_server mv sandbox/var/empire/tel sandbox/var/empire/setup.tel mv sandbox/var/empire/empty.tel sandbox/var/empire/tel + mv sandbox/var/empire/news sandbox/var/empire/setup.news + >sandbox/var/empire/news + mv sandbox/var/empire/lostitems sandbox/var/empire/setup.lostitems + >sandbox/var/empire/lostitems mv sandbox/var/empire/journal.log sandbox/var/empire/setup.journal.log mv sandbox/var/empire/server.log sandbox/var/empire/setup.server.log fi