Change error message to clearly relate it to pytest-timeout

Author: pedro-psb

pytest_timeout.py

@@ -495,7 +495,7 @@ def timeout_sigalrm(item, settings):
     dump_stacks(terminal)
     if nthreads > 1:
         terminal.sep("+", title="Timeout")
-    pytest.fail("Timeout >%ss" % settings.timeout)
+    pytest.fail("Timeout (>%ss) from pytest-timeout plugin." % settings.timeout)
 
 
 def timeout_timer(item, settings):

test_pytest_timeout.py

@@ -44,7 +44,7 @@ def test_foo():
      """
     )
     result = pytester.runpytest_subprocess("--timeout=1")
-    result.stdout.fnmatch_lines(["*Failed: Timeout >1.0s*"])
+    result.stdout.fnmatch_lines(["*Failed: Timeout (>1.0s) from pytest-timeout plugin.*"])
 
 
 def test_thread(pytester):
@@ -239,7 +239,7 @@ def test_foo():
     """
     )
     result = pytester.runpytest_subprocess()
-    result.stdout.fnmatch_lines(["*Failed: Timeout >1.0s*"])
+    result.stdout.fnmatch_lines(["*Failed: Timeout (>1.0s) from pytest-timeout plugin.*"])
 
 
 def test_timeout_mark_timer(pytester):
@@ -480,7 +480,7 @@ def test_foo():
     result = child.read().decode().lower()
     if child.isalive():
         child.terminate(force=True)
-    assert "timeout >1.0s" not in result
+    assert "timeout (>1.0s)" not in result
     assert "fail" not in result
 
 
@@ -524,7 +524,7 @@ def test_foo():
     result = child.read().decode().lower()
     if child.isalive():
         child.terminate(force=True)
-    assert "timeout >1.0s" in result
+    assert "timeout (>1.0s)" in result
     assert "fail" in result