Merge pull request #146 from python-cmd2/pb_unittest

Improved how subprocess module is used

1 files changed, 7 insertions, 23 deletions

diff --git a/tests/test_cmd2.py b/tests/test_cmd2.py
index 5ca95275..adf47d31 100644
--- a/tests/test_cmd2.py
+++ b/tests/test_cmd2.py
@@ -416,27 +416,20 @@ def test_pipe_to_shell(base_app):
 def test_send_to_paste_buffer(base_app):
     from cmd2 import can_clip
 
+    # Test writing to the PasteBuffer/Clipboard
     run_cmd(base_app, 'help >')
     expected = normalize(BASE_HELP)
 
     # If the tools for interacting with the clipboard/pastebuffer are available
     if cmd2.can_clip:
         # Read from the clipboard
-        try:
-            # Python2
-            import Tkinter as tk
-        except ImportError:
-            # Python3
-            import tkinter as tk
+        assert normalize(cmd2.get_paste_buffer()) == expected
 
-        root = tk.Tk()
-        # keep the window from showing
-        root.withdraw()
-
-        # read the clipboard
-        c = root.clipboard_get()
-
-        assert normalize(c) == expected
+    # Test appending to the PasteBuffer/Clipboard
+    run_cmd(base_app, 'help history >>')
+    expected = normalize(BASE_HELP + '\n' + HELP_HISTORY)
+    if cmd2.can_clip:
+        assert normalize(cmd2.get_paste_buffer()) == expected
 
 
 def test_base_timing(base_app, capsys):
@@ -634,12 +627,3 @@ def test_cmdloop_without_rawinput():
         app.cmdloop()
     out = app.stdout.buffer
     assert out == expected
-
-
-@pytest.mark.skipif(not cmd2.can_clip,
-                    reason="CLI utility for interacting with PasteBuffer/ClipBoard is not available")
-def test_pastebuffer_read_and_write():
-    text_to_pb = 'This is a test ...'
-    cmd2.write_to_paste_buffer(text_to_pb)
-    text_from_pb = cmd2.get_paste_buffer()
-    assert text_from_pb == text_to_pb