From 192813103433242e70da83ce6afc05fe34747d84 Mon Sep 17 00:00:00 2001
From: Trym Bremnes <trym.bremnes@zivid.com>
Date: Fri, 25 Oct 2019 07:59:41 +0200
Subject: [PATCH] Removed pylint disable redefined-out-name in conftest

We can enable redefined-out-name from test/conftest.py by giving the
fixtures a name through the @pytest.fixture decorator.
---
 test/conftest.py | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/test/conftest.py b/test/conftest.py
index 4498393c..de579743 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -2,16 +2,16 @@
 from scripts.sample_data import download_and_extract
 
 
-@pytest.fixture()
-def application():
+@pytest.fixture(name="application")
+def application_fixture():
     import zivid
 
     with zivid.Application() as app:
         yield app
 
 
-@pytest.fixture(scope="session")
-def sample_data_file():
+@pytest.fixture(name="sample_data_file", scope="session")
+def sample_data_file_fixture():
     from pathlib import Path
     import tempfile
 
@@ -21,24 +21,22 @@ def sample_data_file():
         yield sample_data
 
 
-@pytest.fixture()
-def file_camera(application, sample_data_file):  # pylint: disable=redefined-outer-name
+@pytest.fixture(name="file_camera")
+def file_camera_fixture(application, sample_data_file):
     with application.create_file_camera(sample_data_file) as file_cam:
         yield file_cam
 
 
-@pytest.fixture()
-def frame(
-    application, sample_data_file
-):  # pylint: disable=redefined-outer-name, unused-argument
+@pytest.fixture(name="frame")
+def frame_fixture(application, sample_data_file):  # pylint: disable=unused-argument
     import zivid
 
     with zivid.Frame(sample_data_file) as frame:
         yield frame
 
 
-@pytest.fixture()
-def random_settings():
+@pytest.fixture(name="random_settings")
+def random_settings_fixture():
     import datetime
     from random import randint, choice, uniform
     import zivid
@@ -68,10 +66,9 @@ def random_settings():
     yield heavily_modified_settings
 
 
-@pytest.fixture()
-def three_frames(
-    application,  # pylint: disable=redefined-outer-name, unused-argument
-    sample_data_file,  # pylint: disable=redefined-outer-name
+@pytest.fixture(name="three_frames")
+def three_frames_fixture(
+    application, sample_data_file  # pylint: disable=unused-argument
 ):
     import zivid