Index: test/functionalities/abbreviation/TestAbbreviations.py =================================================================== --- test/functionalities/abbreviation/TestAbbreviations.py +++ test/functionalities/abbreviation/TestAbbreviations.py @@ -34,7 +34,7 @@ # Only one matching command: execute it. self.expect("h", - startstr = "The following is a list of built-in, permanent debugger commands:") + startstr = "Debugger commands:") # Execute cleanup function during test tear down def cleanup(): Index: test/functionalities/alias/TestAliases.py =================================================================== --- test/functionalities/alias/TestAliases.py +++ test/functionalities/alias/TestAliases.py @@ -114,10 +114,10 @@ self.expect ("help -a run", substrs = [ "'run' is an abbreviation for 'process launch -c /bin/sh --'" ]) - self.expect ("help -a", + self.expect ("help", substrs = [ 'run', 'process launch -c /bin/sh' ]) - self.expect ("help", matching=False, + self.expect ("help -a", matching=False, substrs = [ "'run'", 'process launch -c /bin/sh' ]) self.expect ("run",