diff options
| author | kotfu <kotfu@kotfu.net> | 2019-07-16 17:30:23 -0600 |
|---|---|---|
| committer | kotfu <kotfu@kotfu.net> | 2019-07-16 17:30:23 -0600 |
| commit | f3ae3e129c9205229922463fc5ef57cc413c0ab9 (patch) | |
| tree | bfe8b7eec20592de74725e5298dec68799f7ebec /tests/conftest.py | |
| parent | a8c4a65106ad6325adec5e662ee8a5397527dba5 (diff) | |
| parent | f77abb09888c6ea3f6d8dadb28de46c36f035459 (diff) | |
| download | cmd2-git-f3ae3e129c9205229922463fc5ef57cc413c0ab9.tar.gz | |
Merge branch 'master' into integrate_legacy_documentation
# Conflicts:
# docs/features/history.rst
Diffstat (limited to 'tests/conftest.py')
| -rw-r--r-- | tests/conftest.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index c0aea4a6..e09e07b1 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -44,8 +44,8 @@ def verify_help_text(cmd2_app: cmd2.Cmd, help_output: Union[str, List[str]]) -> # Help text for the history command -HELP_HISTORY = """Usage: history [-h] [-r | -e | -o FILE | -t TRANSCRIPT | -c] [-s] [-x] [-v] - [-a] +HELP_HISTORY = """Usage: history [-h] [-r | -e | -o FILE | -t TRANSCRIPT_FILE | -c] [-s] [-x] + [-v] [-a] [arg] View, run, edit, save, or clear previously entered commands @@ -61,9 +61,9 @@ optional arguments: -h, --help show this help message and exit -r, --run run selected history items -e, --edit edit and then run selected history items - -o, --output-file FILE + -o, --output_file FILE output commands to a script file, implies -s - -t, --transcript TRANSCRIPT + -t, --transcript TRANSCRIPT_FILE output commands and results to a transcript file, implies -s -c, --clear clear all history |