diff options
| -rw-r--r-- | .travis.yml | 36 | ||||
| -rw-r--r-- | docs/settingchanges.rst | 3 | ||||
| -rw-r--r-- | save.hist | 7 | ||||
| -rw-r--r-- | tests/test_cmd2.py | 2 | ||||
| -rw-r--r-- | tests/test_completion.py | 2 |
5 files changed, 21 insertions, 29 deletions
diff --git a/.travis.yml b/.travis.yml index 2d59e8c5..270fe4f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,25 +28,25 @@ matrix: # python: pypy3 # env: TOXENV=pypy3 # Stock OSX Python - - os: osx - language: generic - env: TOXENV=py27 - # Latest Python 3.x from Homebrew - - os: osx - language: generic - env: - - TOXENV=py36 - - BREW_INSTALL=python3 +# - os: osx +# language: generic +# env: TOXENV=py27 +# # Latest Python 3.x from Homebrew +# - os: osx +# language: generic +# env: +# - TOXENV=py36 +# - BREW_INSTALL=python3 install: -# - pip install tox - - | - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then - if [[ -n "$BREW_INSTALL" ]]; then - brew update - brew install "$BREW_INSTALL" - fi - fi - pip install tox + - pip install tox +# - | +# if [[ $TRAVIS_OS_NAME == 'osx' ]]; then +# if [[ -n "$BREW_INSTALL" ]]; then +# brew update +# brew install "$BREW_INSTALL" +# fi +# fi +# pip install tox script: - tox diff --git a/docs/settingchanges.rst b/docs/settingchanges.rst index 94849246..bdb5d186 100644 --- a/docs/settingchanges.rst +++ b/docs/settingchanges.rst @@ -104,12 +104,11 @@ with:: (Cmd) set --long abbrev: True # Accept abbreviated commands - autorun_on_edit: True # Automatically run files after editing + autorun_on_edit: False # Automatically run files after editing case_insensitive: True # upper- and lower-case both OK colors: True # Colorized output (*nix only) continuation_prompt: > # On 2nd+ line of input debug: False # Show full error stack on error - default_file_name: command.txt # for ``save``, ``load``, etc. echo: False # Echo command issued into output editor: vim # Program used by ``edit`` feedback_to_output: False # include nonessentials in `|`, `>` results diff --git a/save.hist b/save.hist deleted file mode 100644 index fa1c39d5..00000000 --- a/save.hist +++ /dev/null @@ -1,7 +0,0 @@ -save - -!cat command.txt - -help save - -save * save.hist
\ No newline at end of file diff --git a/tests/test_cmd2.py b/tests/test_cmd2.py index 707699f3..5ca95275 100644 --- a/tests/test_cmd2.py +++ b/tests/test_cmd2.py @@ -288,7 +288,7 @@ def test_base_load_with_empty_args(base_app, capsys): run_cmd(base_app, 'load') out, err = capsys.readouterr() - # The default file 'command.txt' doesn't exist, so we should get an error message + # The load command requires a file path argument, so we should get an error message expected = normalize("""ERROR: load command requires a file path:\n""") assert normalize(str(err)) == expected diff --git a/tests/test_completion.py b/tests/test_completion.py index 220d6e26..a12a4ec2 100644 --- a/tests/test_completion.py +++ b/tests/test_completion.py @@ -150,7 +150,7 @@ def test_path_completion_multiple(cmd2_app, request): endidx = len(line) begidx = endidx - len(text) - assert cmd2_app.path_complete(text, line, begidx, endidx) == ['script.py', 'script.txt', 'scripts/'] + assert cmd2_app.path_complete(text, line, begidx, endidx) == ['script.py', 'script.txt', 'scripts' + os.path.sep] def test_path_completion_nomatch(cmd2_app, request): test_dir = os.path.dirname(request.module.__file__) |