summaryrefslogtreecommitdiff
path: root/tests/conftest.py
diff options
context:
space:
mode:
authorEric Lin <anselor@gmail.com>2018-05-02 15:22:14 -0400
committerEric Lin <anselor@gmail.com>2018-05-02 15:22:14 -0400
commita55f0b6ed559d03f2d8b596898d638b288c11a68 (patch)
tree54d84c8d1d7c14247ac3a22186ed106190a8b494 /tests/conftest.py
parentdbf4846e8bc0e6ca38c928d8fe4752f9b6173803 (diff)
parenta95c8a065abeac286c196783393ecc49e4356f54 (diff)
downloadcmd2-git-a55f0b6ed559d03f2d8b596898d638b288c11a68.tar.gz
Merge branch 'test_merge' into test_ply_merge
Diffstat (limited to 'tests/conftest.py')
-rw-r--r--tests/conftest.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index ed76cba9..562ca4fa 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -10,7 +10,7 @@ import sys
from pytest import fixture
from unittest import mock
-import cmd2
+from cmd2 import cmd2
# Prefer statically linked gnureadline if available (for macOS compatibility due to issues with libedit)
try:
@@ -89,7 +89,7 @@ debug: False
echo: False
editor: vim
feedback_to_output: False
-locals_in_py: True
+locals_in_py: False
prompt: (Cmd)
quiet: False
timing: False
@@ -106,7 +106,7 @@ debug: False # Show full error stack on error
echo: False # Echo command issued into output
editor: vim # Program used by ``edit``
feedback_to_output: False # Include nonessentials in `|`, `>` results
-locals_in_py: True # Allow access to your application in py via self
+locals_in_py: False # Allow access to your application in py via self
prompt: (Cmd) # The prompt issued to solicit input
quiet: False # Don't print nonessential feedback
timing: False # Report execution times