refactor(tests): don't hardcode temp file lines

Author: thekaveman

tests/commands/test_offboard.py

@@ -20,8 +20,8 @@ def mock_input_no(mock_input):
 
 
 @pytest.fixture
-def mock_NamedTemporaryFile(mock_NamedTemporaryFile):
-    return mock_NamedTemporaryFile(MODULE, ["Overall Transfer Status: completed"])
+def mock_NamedTemporaryFile(mock_NamedTemporaryFile_with_readlines):
+    return mock_NamedTemporaryFile_with_readlines(MODULE, ["Overall Transfer Status: completed"])
 
 
 @pytest.fixture

tests/conftest.py

@@ -137,7 +137,7 @@ def mock_google_user_is_staff(mock_module_name):
 
 
 @pytest.fixture
-def mock_NamedTemporaryFile(mocker):
+def mock_NamedTemporaryFile_with_readlines(mocker):
     """Fixture returns a function that patches NamedTemporaryFile in a given module.
 
     Optionally provide a value for GAM stdout.readlines().

tests/services/test_google.py

@@ -50,11 +50,6 @@ def mock_subprocess_call(mocker):
     return mocker.patch(f"{MODULE}.subprocess.call")
 
 
-@pytest.fixture
-def mock_NamedTemporaryFile(mock_NamedTemporaryFile):
-    return mock_NamedTemporaryFile(MODULE, ["group"])
-
-
 def test_user_account_name_None():
     username = None
     account = user_account_name(username)
@@ -208,18 +203,20 @@ def test_user_in_group_user_does_not_exist(mock_google_user_exists, capfd):
     assert "User does not exist" in captured.out
 
 
-@pytest.mark.usefixtures("mock_NamedTemporaryFile", "mock_google_CallGAMCommand")
-def test_user_in_group_user_exists_in_group(mock_google_user_exists):
+@pytest.mark.usefixtures("mock_google_CallGAMCommand")
+def test_user_in_group_user_exists_in_group(mock_google_user_exists, mock_NamedTemporaryFile_with_readlines):
     mock_google_user_exists.return_value = True
+    mock_NamedTemporaryFile_with_readlines(MODULE, ["group"])
 
     res = user_in_group("username", "group")
 
     assert res is True
 
 
-@pytest.mark.usefixtures("mock_NamedTemporaryFile", "mock_google_CallGAMCommand")
-def test_user_in_group_user_exists_not_in_group(mock_google_user_exists):
+@pytest.mark.usefixtures("mock_google_CallGAMCommand")
+def test_user_in_group_user_exists_not_in_group(mock_google_user_exists, mock_NamedTemporaryFile_with_readlines):
     mock_google_user_exists.return_value = True
+    mock_NamedTemporaryFile_with_readlines(MODULE, ["group"])
 
     res = user_in_group("username", "nope")