Merge two tests so the suite can run a little faster.

linenoise

@@ -1 +1 @@
-Subproject commit 2105ce445821381cf1bca87b6d386d4ea88ee20d
+Subproject commit c894b9e59f02203dbe4e2be657572cf88c4230c3

tests/chainrelock.log

@@ -1,269 +0,0 @@
-## Attempt to re-lock chain after it's already locked
-# Based on walkthrough at http://www.ecsoftwareconsulting.com/node/56
-n
-seed 1495951709
-in
-take lamp
-on
-xyzzy
-take rod
-e
-take cage
-w
-w
-w
-drop rod
-take bird
-take rod
-w
-free bird
-wave rod
-take jade
-drop rod
-take bird
-take rod
-d
-w
-wave rod
-drop rod
-e
-n
-free bird
-take bird
-s
-take jewelry
-n
-sw
-w
-kill dragon
-yes
-drink blood
-take rug
-e
-e
-n
-take silver
-n
-plugh
-drop silver
-drop jewelry
-drop jade
-drop rug
-out
-s
-w
-n
-take appendage
-free bird
-listen
-s
-s
-n
-in
-take water
-plugh
-plover
-ne
-take axe
-take pyramid
-s
-plover
-s
-d
-u
-u
-throw axe
-take axe
-throw axe
-take axe
-throw axe
-take axe
-throw axe
-take axe
-s
-e
-w
-drop cage
-w
-w
-w
-w
-s
-sw
-se
-s
-kill machine
-s
-s
-kill ogre
-n
-take ruby
-s
-w
-n
-n
-n
-nw
-d
-e
-e
-e
-take diamonds
-e
-e
-s
-take gold
-n
-y2
-d
-plugh
-drop diamonds
-drop pyramid
-drop ruby
-plugh
-plugh
-drop coins
-plugh
-s
-d
-bedquilt
-slab
-s
-d
-water plant
-u
-w
-u
-reservoir
-Q'IBJ
-n
-n
-nw
-u
-u
-u
-u
-ne
-take ebony
-sw
-d
-d
-d
-d
-se
-s
-s
-take water
-s
-s
-d
-s
-d
-water plant
-u
-e
-d
-take oil
-u
-w
-d
-climb
-w
-n
-oil door
-n
-take trident
-w
-d
-se
-n
-w
-drop trident
-drop axe
-drop ebony
-drop bottle
-drop appendage
-drop lamp
-e
-take emerald
-w
-take lamp
-take bottle
-take ebony
-take axe
-take trident
-nw
-s
-take vase
-e
-se
-e
-take pillow
-w
-ne
-e
-n
-open clam
-s
-u
-e
-u
-n
-plugh
-drop pillow
-drop vase
-drop trident
-drop ebony
-drop emerald
-take food
-take keys
-plugh
-s
-s
-w
-take coins
-e
-n
-d
-w
-d
-n
-d
-d
-take pearl
-up
-u
-s
-w
-throw axe
-take axe
-w
-throw axe
-take axe
-w
-d
-get oil
-u
-w
-d
-climb
-w
-get eggs
-drop coins
-get eggs
-n
-n
-d
-w
-d
-sw
-up
-toss eggs
-ne
-ne
-barren
-in
-feed bear
-unlock chain
-lock chain
-lock chain

tests/lockchain.chk

@@ -1696,6 +1696,10 @@ It was already unlocked.
 
 The chain is now locked.
 
+> lock chain
+
+It was already locked.
+
 > unlock chain
 
 The chain is now unlocked.
@@ -1715,7 +1719,7 @@ Glistening pearl
 You are being followed by a very large, tame bear.
 
 
-You scored 225 out of a possible 430, using 297 turns.
+You scored 225 out of a possible 430, using 298 turns.
 
 You may now consider yourself a "Seasoned Adventurer".
 

tests/lockchain.log

@@ -1,4 +1,4 @@
-## Test re-locking of bear's chain
+## Test multiple re-locking and unlocking of bear's chain
 # Based on walkthrough at http://www.ecsoftwareconsulting.com/node/56
 n
 seed 1635997320
@@ -299,6 +299,7 @@ unlock chain
 unlock chain
 # Also tests message from bear in inventory
 lock chain
+lock chain
 unlock chain
 take bear
 inven