Change --live-server-scope to an ini option

This was brought up in #113, but was missed.

Author: nicoddemus

docs/features.rst

@@ -188,15 +188,17 @@ in your project's ``pytest.ini`` file)::
 ``request_ctx`` - request context
 `````````````````````````````````
 
-``--live-server-scope`` - set the scope of the live server
+``live_server_scope`` - set the scope of the live server
 ``````````````````````````````````````````````````````````````````
 
-By default, the server will be scoped to `session`. In some cases, you may want
-it to be fixed to a different scope. You can use ``--live-server-scope`` (for example,
-in your project's ``pytest.ini`` file)::
+By default, the server will be scoped to ``session`` for performance reasons, however
+if your server has global state and you want better test isolation, you can use the
+``live_server_scope`` ini option to change the fixture scope:
+
+.. code-block:: ini
 
     [pytest]
-    addopts = --live-server-scope=function
+    live_server_scope = function
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

pytest_flask/fixtures.py

@@ -116,8 +116,8 @@ def _rewrite_server_name(server_name, new_port):
     return sep.join((server_name, new_port))
 
 
-def determine_scope(fixture_name, config):
-    return config.getoption('--live-server-scope', 'session')
+def determine_scope(*, fixture_name, config):
+    return config.getini('live_server_scope')
 
 
 @pytest.fixture(scope=determine_scope)

pytest_flask/plugin.py

@@ -168,8 +168,8 @@ def pytest_addoption(parser):
                     help='use a host where to listen (default localhost).')
     group.addoption('--live-server-port', action='store', default=0, type=int,
                     help='use a fixed port for the live_server fixture.')
-    group.addoption('--live-server-scope', action='store', default='session', type=str,
-                    help='modify the scope of the live_server fixture.')
+    parser.addini('live_server_scope', 'modify the scope of the live_server fixture.',
+                  default='session')
 
 
 def pytest_configure(config):

tests/test_live_server.py

@@ -42,7 +42,7 @@ def test_a(live_server):
                     'example.com:%d' % live_server.port
         ''')
 
-        result = appdir.runpytest('-v', '--live-server-scope=function')
+        result = appdir.runpytest('-v', '-o=live_server_scope=function')
         result.stdout.fnmatch_lines(['*PASSED*'])
         assert result.ret == 0