Skip to content

Fixing unit tests that were causing problems on the test servers #806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kmvanbrunt merged 2 commits into from
Nov 13, 2019
Merged

Fixing unit tests that were causing problems on the test servers #806

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
640d723
Fixing unit tests that were causing problems on the test servers
kmvanbrunt Nov 13, 2019
d33c2dc
Put an end time for timeout command just as a precaution
kmvanbrunt Nov 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions tests/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,24 +227,24 @@ def test_stdsim_line_buffering(base_app):
def pr_none():
import subprocess

# Start a long running process so we have time to run tests on it before it finishes
# Put the new process into a separate group so signals sent to it won't interfere with this process
if sys.platform.startswith('win'):
command = 'dir'
command = 'timeout -t 5 /nobreak'
creationflags = subprocess.CREATE_NEW_PROCESS_GROUP
start_new_session = False
else:
command = 'ls'
command = 'sleep 5'
creationflags = 0
start_new_session = True

proc = subprocess.Popen([command],
proc = subprocess.Popen(command,
creationflags=creationflags,
start_new_session=start_new_session,
shell=True)
pr = cu.ProcReader(proc, None, None)
return pr

@pytest.mark.skipif(sys.platform == 'linux', reason="Test doesn't work correctly on TravisCI")
def test_proc_reader_send_sigint(pr_none):
assert pr_none._proc.poll() is None
pr_none.send_sigint()
Expand All @@ -255,8 +255,6 @@ def test_proc_reader_send_sigint(pr_none):
else:
assert ret_code == -signal.SIGINT

@pytest.mark.skipif(not sys.platform.startswith('win'),
reason="Test doesn't work correctly on TravisCI and is unreliable on Azure DevOps macOS")
def test_proc_reader_terminate(pr_none):
assert pr_none._proc.poll() is None
pr_none.terminate()
Expand All @@ -267,13 +265,6 @@ def test_proc_reader_terminate(pr_none):
else:
assert ret_code == -signal.SIGTERM

@pytest.mark.skipif(not sys.platform.startswith('win'),
reason="Test doesn't work correctly on TravisCI and is unreliable on Azure DevOps macOS")
def test_proc_reader_wait(pr_none):
assert pr_none._proc.poll() is None
pr_none.wait()
assert pr_none._proc.poll() == 0


@pytest.fixture
def context_flag():
Expand Down