Fix failing tests (#261)

* Fix failing report tests due to pytest-html release.

* Fix deprecation warnings:

* Remove warning that has been fix
* Ensure pytest-selenium warnings are raised in tests

* Black fix.

Co-authored-by: ich <ich@desktop>
Co-authored-by: dosas <dosas@github.com>

pytest_selenium/pytest_selenium.py

@@ -46,8 +46,8 @@
 
 
 def _merge(a, b):
-    """ merges b and a configurations.
-        Based on http://bit.ly/2uFUHgb
+    """merges b and a configurations.
+    Based on http://bit.ly/2uFUHgb
     """
     for key in b:
         if key in a:

testing/test_driver.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from contextlib import ExitStack as does_not_raise
 from functools import partial
 
 import pytest_selenium
@@ -107,10 +108,13 @@ def test_pass(driver_kwargs):
 
 
 @pytest.mark.parametrize(
-    ("host_arg_name", "port_arg_name"),
-    [("--selenium-host", "--selenium-port"), ("--host", "--port")],
+    ("host_arg_name", "port_arg_name", "context"),
+    [
+        ("--selenium-host", "--selenium-port", does_not_raise()),
+        ("--host", "--port", pytest.warns(DeprecationWarning)),
+    ],
 )
-def test_arguments_order(testdir, host_arg_name, port_arg_name):
+def test_arguments_order(testdir, host_arg_name, port_arg_name, context):
     host = "notlocalhost"
     port = "4441"
     file_test = testdir.makepyfile(
@@ -123,16 +127,17 @@ def test_pass(driver_kwargs):
             host, port
         )
     )
-    testdir.quick_qa(
-        "--driver",
-        "Remote",
-        host_arg_name,
-        host,
-        port_arg_name,
-        port,
-        file_test,
-        passed=1,
-    )
+    with context:
+        testdir.quick_qa(
+            "--driver",
+            "Remote",
+            host_arg_name,
+            host,
+            port_arg_name,
+            port,
+            file_test,
+            passed=1,
+        )
 
 
 def test_arguments_order_random(testdir):

testing/test_metadata.py

@@ -2,6 +2,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from contextlib import ExitStack as does_not_raise
+
 import pytest
 
 pytestmark = pytest.mark.nondestructive
@@ -24,10 +26,13 @@ def test_pass(metadata):
 
 
 @pytest.mark.parametrize(
-    ("host_arg_name", "port_arg_name"),
-    [("--selenium-host", "--selenium-port"), ("--host", "--port")],
+    ("host_arg_name", "port_arg_name", "context"),
+    [
+        ("--selenium-host", "--selenium-port", does_not_raise()),
+        ("--host", "--port", pytest.warns(DeprecationWarning)),
+    ],
 )
-def test_metadata_host_port(testdir, host_arg_name, port_arg_name):
+def test_metadata_host_port(testdir, host_arg_name, port_arg_name, context):
     host = "notlocalhost"
     port = "4441"
     file_test = testdir.makepyfile(
@@ -40,13 +45,14 @@ def test_pass(metadata):
             host, port
         )
     )
-    testdir.quick_qa(
-        "--driver",
-        "Remote",
-        host_arg_name,
-        host,
-        port_arg_name,
-        port,
-        file_test,
-        passed=1,
-    )
+    with context:
+        testdir.quick_qa(
+            "--driver",
+            "Remote",
+            host_arg_name,
+            host,
+            port_arg_name,
+            port,
+            file_test,
+            passed=1,
+        )

testing/test_report.py

@@ -18,10 +18,11 @@
     SCREENSHOT_LINK_REGEX = '<a class="image" href=".*" target="_blank">Screenshot</a>'
     SCREENSHOT_REGEX = '<div class="image"><a href=".*"><img src=".*"/></a></div>'
 else:
-    SCREENSHOT_LINK_REGEX = '<a class="image" href=".*" target="_blank"></a>'
-    SCREENSHOT_REGEX = (
-        '<div class="image"><a class="image" href=".*" target="_blank"></a></div>'
+    SCREENSHOT_LINK_REGEX = (
+        '<a class="image" href=".*" target="_blank"><img src=".*"/></a>'
     )
+    SCREENSHOT_REGEX = '<div class="image"><a class="image" href=".*" target="_blank">'
+    '<img src=".*"/></a></div>'
 
 LOGS_REGEX = '<a class="text" href=".*" target="_blank">.* Log</a>'
 HTML_REGEX = '<a class="text" href=".*" target="_blank">HTML</a>'

tox.ini

@@ -43,7 +43,3 @@ markers =
     chrome
     skip_selenium
     nondestructive
-# TODO: Temporary hack until they fix
-# https://github.com/pytest-dev/pytest/issues/6936
-filterwarnings =
-    ignore:.*TerminalReporter.writer attribute is deprecated.*:pytest.PytestDeprecationWarning