Remove Pocket mode functional tests

Author: alexgibson

bin/integration_tests/functional_tests.sh

@@ -61,7 +61,6 @@ docker run \
     -e "PLATFORM=${PLATFORM:-}" \
     -e "MARK_EXPRESSION=${MARK_EXPRESSION:-}" \
     -e "BASE_URL=${BASE_URL:-}" \
-    -e "BASE_POCKET_URL=${BASE_POCKET_URL:-}" \
     -e "PYTEST_PROCESSES=${PYTEST_PROCESSES:=4}" \
     -e "BOUNCER_URL=${BOUNCER_URL:=https://download.mozilla.org/}" \
     -e "SCREEN_WIDTH=1600" \

docs/testing.rst

@@ -304,7 +304,7 @@ to pull in external data such as event/blog feeds etc. These are required for
 some of the tests to pass.
 
 To run the full Selenium integration test suite against your local bedrock
-instance in Mozorg mode:
+instance:
 
 .. code-block:: bash
 
@@ -314,25 +314,11 @@ This will run all test suites found in the ``tests/functional`` directory and
 assumes you have bedrock running at ``localhost`` on port ``8000``. Results will
 be reported in ``tests/functional/results.html``.
 
-To run the full Selenium test suite against your local bedrock instance in
-Pocket mode, things are slightly different, because of the way things are set
-up in order to allow CI to test both Mozorg Mode and Pocket Mode at the same
-time. You need to define a temporary environment variable (needed by the
-`pocket_base_url` fixture) and scope pytest to only run Pocket tests:
-
-.. code-block:: bash
-
-    $ BASE_POCKET_URL=http://localhost:8000 pytest -m pocket_mode --driver Firefox --html tests/functional/results.html tests/functional/
-
-This will run all test suites found in the ``tests/functional`` directory that have
-the pytest "`mark`" of `pocket_mode` and assumes you have bedrock running *in Pocket mode* at
-``localhost`` on port ``8000``. Results will be reported in ``tests/functional/results.html``.
-
 .. Note::
 
-    If you omit the ``--base-url`` command line option in Mozorg mode (ie, not
-    in Pocket mode) then a local instance of bedrock will be started, however
-    the tests are not currently able to run against bedrock in this way.
+    If you omit the ``--base-url`` command line option then a local instance
+    of bedrock will be started, however the tests are not currently able to
+    run against bedrock in this way.
 
 By default, tests will run one at a time. This is the safest way to ensure
 predictable results, due to

setup.cfg

@@ -16,7 +16,6 @@ markers =
     skip_if_internet_explorer
     skip_if_not_firefox
     smoke
-    pocket_mode
 
 
 [tool:paul-mclendahand]

tests/conftest.py

@@ -4,17 +4,7 @@
 
 import pytest
 
-from bedrock.base.config_manager import config
-
 
 @pytest.fixture(scope="session")
 def base_url(base_url, request):
     return base_url or request.getfixturevalue("live_server").url
-
-
-@pytest.fixture(scope="session")
-def pocket_base_url(request):
-    base_url = config("BASE_POCKET_URL", parser=str, default="")
-    if not base_url:
-        pytest.skip("No BASE_POCKET_URL detected in env vars")
-    return base_url