From 09e0fc0b37d0a16c845c18f9118dbb38250c2b5a Mon Sep 17 00:00:00 2001 From: Kevin Van Brunt Date: Thu, 26 Apr 2018 13:12:27 -0400 Subject: No longer running test_path_completion_complete_user unit test on Windows --- tests/test_completion.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/test_completion.py b/tests/test_completion.py index 839e1de2..d0e84f12 100644 --- a/tests/test_completion.py +++ b/tests/test_completion.py @@ -321,10 +321,11 @@ def test_path_completion_doesnt_match_wildcards(cmd2_app, request): # Currently path completion doesn't accept wildcards, so will always return empty results assert cmd2_app.path_complete(text, line, begidx, endidx) == [] -def test_path_completion_expand_user_dir(cmd2_app): - # Get the current user. We can't use getpass.getuser() since - # that doesn't work when running these tests on Windows in AppVeyor. - user = os.path.basename(os.path.expanduser('~')) +@pytest.mark.skipif(sys.platform == 'win32', reason="getpass.getuser() does not work on Windows in AppVeyor because " + "no user name environment variables are set") +def test_path_completion_complete_user(cmd2_app): + import getpass + user = getpass.getuser() text = '~{}'.format(user) line = 'shell fake {}'.format(text) @@ -335,7 +336,7 @@ def test_path_completion_expand_user_dir(cmd2_app): expected = text + os.path.sep assert expected in completions -def test_path_completion_user_expansion(cmd2_app): +def test_path_completion_user_path_expansion(cmd2_app): # Run path with a tilde and a slash if sys.platform.startswith('win'): cmd = 'dir' -- cgit v1.2.1