tests/navi-march: Cover abort at movement prompt

This exposes generation oopses.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/tests/navi-march/01-navigate-1 b/tests/navi-march/01-navigate-1
index 3e0b3ee64dd816fcb318b364dfe45dad9112e451..375ee792387b7345efb63ec4546b2f7de136109b 100644 (file)
--- a/tests/navi-march/01-navigate-1
+++ b/tests/navi-march/01-navigate-1
@@ -1,8 +1,11 @@
-|| list, change leader, nonsense
+|| list, change leader, nonsense, abort command
 navi 2/3/0 i
 fi
 X
 
+navi 0
+aborted
+__cmd added 1 1 0
 || stuck in starting sector
 | on sale/unremarkable/dead/foreign/crewless in 0,0
 set s 12 500

diff --git a/tests/navi-march/02-march-1 b/tests/navi-march/02-march-1
index 41783f4a46df00154686b18fa3d2b8e82fee924c..e6a4ca2a8910033ba942288633a72610a0161151 100644 (file)
--- a/tests/navi-march/02-march-1
+++ b/tests/navi-march/02-march-1
@@ -1,8 +1,11 @@
-|| list, change flagship, nonsense
+|| list, change flagship, nonsense, abort command
 march 2/3/0 i
 fi
 X
 
+navi 0
+aborted
+__cmd added 1 1 0
 || stuck in starting sector
 | on sale/unremarkable/dead/foreign/crewless/loaded in 1,1
 set l 12 500

diff --git a/tests/navi-march/journal.log b/tests/navi-march/journal.log
index 78a87b7ae791697c8ab556817fd2c9a135e37fd6..f8090b20c85a1dac4aed3a13d26d076a9998acc2 100644 (file)
--- a/tests/navi-march/journal.log
+++ b/tests/navi-march/journal.log
@@ -58,6 +58,20 @@
     Play#1 output Play#1 1 pt   patrol boat (#0) stopped at 1,1
     Play#1 output Play#1 1 dd   destroyer (#2) stopped at 1,1
     Play#1 output Play#1 6 0 639
+    Play#1 input navi 0
+    Play#1 command navigate
+    Play#1 output Play#1 1 Flagship is pt   patrol boat (#0)
+    Play#1 output Play#1 1  . =
+    Play#1 output Play#1 1 h h h
+    Play#1 output Play#1 1  c c
+    Play#1 output Play#1 4 <127.0:127.0: 1,1>
+    Play#1 input aborted
+    Play#1 output Play#1 1 pt   patrol boat (#0) stopped at 1,1
+    Play#1 output Play#1 1 command failed
+    Play#1 output Play#1 6 0 638
+    Play#1 input __cmd added 1 1 0
+    Play#1 command __cmd
+    Play#1 output Play#1 6 0 639
     Play#1 input set s 12 500
     Play#1 command set
     Play#1 output Play#1 1 pt   patrol boat #12 (lot #0) price set to $500
@@ -772,6 +786,20 @@
     Play#1 output Play#1 1 cav  cavalry #0 stopped at 1,1
     Play#1 output Play#1 1 spy  infiltrator #2 stopped at 1,1
     Play#1 output Play#1 6 0 589
+    Play#1 input navi 0
+    Play#1 command navigate
+    Play#1 output Play#1 1 Flagship is pt   patrol boat (#0)
+    Play#1 output Play#1 1  . =
+    Play#1 output Play#1 1 h h h
+    Play#1 output Play#1 1  c c
+    Play#1 output Play#1 4 <127.0:127.0: 1,1>
+    Play#1 input aborted
+    Play#1 output Play#1 1 pt   patrol boat (#0) stopped at 1,1
+    Play#1 output Play#1 1 command failed
+    Play#1 output Play#1 6 0 588
+    Play#1 input __cmd added 1 1 0
+    Play#1 command __cmd
+    Play#1 output Play#1 6 0 589
     Play#1 input set l 12 500
     Play#1 command set
     Play#1 output Play#1 1 cav  cavalry #12 (lot #1) price set to $500

diff --git a/tests/navi-march/server.log b/tests/navi-march/server.log
index b5b9382b35987a01775dbd8206905c69e767c315..63b14eddce1d5066b22f04afd6c8e6275d4b68b0 100644 (file)
--- a/tests/navi-march/server.log
+++ b/tests/navi-march/server.log
@@ -8,10 +8,14 @@ Connect from 127.0.0.1
 Connect from 127.0.0.1
 tester@127.0.0.1 using country #1
 tester@127.0.0.1 logged in as country #1
+Oops: elt->generation != (ef_generation & 0xfff) in ../src/lib/common/file.c:699
+Crash dump complete
 tester@127.0.0.1 logged out, country #1
 Connect from 127.0.0.1
 tester@127.0.0.1 using country #1
 tester@127.0.0.1 logged in as country #1
+Oops: elt->generation != (ef_generation & 0xfff) in ../src/lib/common/file.c:699
+Crash dump complete
 tester@127.0.0.1 logged out, country #1
 Connect from 127.0.0.1
 tester@127.0.0.1 using country #0