summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorkotfu <kotfu@kotfu.net>2018-04-16 23:09:26 -0600
committerkotfu <kotfu@kotfu.net>2018-04-16 23:09:26 -0600
commit49f02121cbe01de1c8203a15e22ab928b37b8971 (patch)
tree16f9f5c56427965de247dfca92e7481cf3fd4843 /tests
parent4a3d01b679c5db7f6cb670ca981a953eb3b98dc5 (diff)
downloadcmd2-git-49f02121cbe01de1c8203a15e22ab928b37b8971.tar.gz
Revert "Basic structure for cmd2 as a package"
This reverts commit 4a3d01b679c5db7f6cb670ca981a953eb3b98dc5.
Diffstat (limited to 'tests')
-rw-r--r--tests/__init__.py5
-rw-r--r--tests/test_argparse.py2
-rw-r--r--tests/test_cmd2.py4
-rw-r--r--tests/test_submenu.py2
-rw-r--r--tests/test_transcript.py2
5 files changed, 5 insertions, 10 deletions
diff --git a/tests/__init__.py b/tests/__init__.py
deleted file mode 100644
index 6d3e5a82..00000000
--- a/tests/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# -*- coding: utf-8 -*-
-#
-from .conftest import run_cmd, StdOut, normalize, BASE_HELP, BASE_HELP_VERBOSE, \
- HELP_HISTORY, SHORTCUTS_TXT, SHOW_TXT, SHOW_LONG
diff --git a/tests/test_argparse.py b/tests/test_argparse.py
index 569dc57b..7096848a 100644
--- a/tests/test_argparse.py
+++ b/tests/test_argparse.py
@@ -8,7 +8,7 @@ import pytest
import cmd2
from unittest import mock
-#from conftest import run_cmd, StdOut
+from conftest import run_cmd, StdOut
# Prefer statically linked gnureadline if available (for macOS compatibility due to issues with libedit)
try:
diff --git a/tests/test_cmd2.py b/tests/test_cmd2.py
index bf6d5242..e4316757 100644
--- a/tests/test_cmd2.py
+++ b/tests/test_cmd2.py
@@ -22,8 +22,8 @@ except ImportError:
from unittest import mock
import cmd2
-#from conftest import run_cmd, normalize, BASE_HELP, BASE_HELP_VERBOSE, \
-# HELP_HISTORY, SHORTCUTS_TXT, SHOW_TXT, SHOW_LONG, StdOut
+from conftest import run_cmd, normalize, BASE_HELP, BASE_HELP_VERBOSE, \
+ HELP_HISTORY, SHORTCUTS_TXT, SHOW_TXT, SHOW_LONG, StdOut
def test_ver():
diff --git a/tests/test_submenu.py b/tests/test_submenu.py
index f91991ea..3064da56 100644
--- a/tests/test_submenu.py
+++ b/tests/test_submenu.py
@@ -5,7 +5,7 @@ Cmd2 testing for argument parsing
import pytest
import cmd2
-#from conftest import run_cmd, StdOut, normalize
+from conftest import run_cmd, StdOut, normalize
class SecondLevelB(cmd2.Cmd):
diff --git a/tests/test_transcript.py b/tests/test_transcript.py
index f3d98b0a..a24f2fa5 100644
--- a/tests/test_transcript.py
+++ b/tests/test_transcript.py
@@ -16,7 +16,7 @@ import pytest
import cmd2
from cmd2 import Cmd, Cmd2TestCase, set_posix_shlex, set_strip_quotes
-#from conftest import run_cmd, StdOut, normalize
+from conftest import run_cmd, StdOut, normalize
class CmdLineApp(Cmd):