summaryrefslogtreecommitdiff
path: root/tests/conftest.py
diff options
context:
space:
mode:
authorKevin Van Brunt <kmvanbrunt@gmail.com>2019-05-13 10:08:09 -0400
committerKevin Van Brunt <kmvanbrunt@gmail.com>2019-05-13 10:08:09 -0400
commit2c5417be5cc52f7c76097f85664adda2c976b1e4 (patch)
tree57f143a32eb3ce2c448b7d19b15c31fb0c48cc87 /tests/conftest.py
parent1dd2c0eae0a578deda8257a5592daf9aca2809ee (diff)
downloadcmd2-git-2c5417be5cc52f7c76097f85664adda2c976b1e4.tar.gz
Fixed parsing issue in case where output redirection (e.g. > file) appears before a pipe.
In that case, the pipe was given precedence even though it appeared later in the command.
Diffstat (limited to 'tests/conftest.py')
-rw-r--r--tests/conftest.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index 56538718..9d55eb4d 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -77,13 +77,17 @@ optional arguments:
-o, --output-file FILE
output commands to a script file, implies -s
-t, --transcript TRANSCRIPT
- output commands and results to a transcript file, implies -s
+ output commands and results to a transcript file,
+ implies -s
-c, --clear clear all history
formatting:
- -s, --script output commands in script format, i.e. without command numbers
- -x, --expanded output expanded commands instead of entered command
- -v, --verbose display history and include expanded commands if they differ from the typed command
+ -s, --script output commands in script format, i.e. without command
+ numbers
+ -x, --expanded output fully parsed commands with any aliases and
+ macros expanded, instead of typed commands
+ -v, --verbose display history and include expanded commands if they
+ differ from the typed command
"""