♻️ Coveralls config gets populated from kwargs

Patching the env is not actually required as we can explicitly pass the config as kwargs.
AndreMiras · Dec 1, 2020 · 8ead214 · 8ead214
1 parent d853282
commit 8ead214
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 51 deletions.
diff --git a/src/entrypoint.py b/src/entrypoint.py
@@ -6,7 +6,6 @@
 import sys
 from contextlib import contextmanager
 from enum import Enum
-from unittest import mock
 
 import requests
 from coveralls.api import Coveralls, CoverallsException
@@ -48,20 +47,6 @@ def cd(newdir):
         os.chdir(prevdir)
 
 
-def patch_os_environ(repo_token, parallel, flag_name):
-    """
-    Temporarily updates the environment variable to satisfy coveralls Python API.
-    That is because the coveralls package API consumes mostly environment variables.
-    """
-    # https://github.com/coveralls-clients/coveralls-python/blob/2.0.0/coveralls/api.py#L146
-    parallel = "true" if parallel else ""
-    environ = {"COVERALLS_REPO_TOKEN": repo_token, "COVERALLS_PARALLEL": parallel}
-    if flag_name:
-        environ["COVERALLS_FLAG_NAME"] = flag_name
-    log.debug(f"Patching os.environ with: {environ}")
-    return mock.patch.dict("os.environ", environ)
-
-
 def run_coveralls(
     repo_token,
     parallel=Default.PARALLEL,
@@ -78,13 +63,19 @@ def run_coveralls(
     # sets `service_job_id` key so it exists, refs:
     # https://github.com/coveralls-clients/coveralls-python/pull/241/files#r532248047
     service_job_id = None
+    kwargs = {
+        "repo_token": repo_token,
+        "service_job_id": service_job_id,
+    }
+    if parallel:
+        kwargs.update({"parallel": parallel})
+    if flag_name is not None:
+        kwargs.update({"flag_name": flag_name})
     result = None
     for service_name in service_names:
         log.info(f"Trying submitting coverage with service_name: {service_name}...")
-        with patch_os_environ(repo_token, parallel, flag_name), cd(base_path):
-            coveralls = Coveralls(
-                service_name=service_name, service_job_id=service_job_id
-            )
+        with cd(base_path):
+            coveralls = Coveralls(service_name=service_name, **kwargs)
             try:
                 result = coveralls.wear()
                 break

diff --git a/tests/test_entrypoint.py b/tests/test_entrypoint.py
@@ -108,10 +108,6 @@ def test_run_coveralls_github_token(self):
         assert json_file["repo_token"] == token
         assert m_log.method_calls == [
             mock.call.info("Trying submitting coverage with service_name: github..."),
-            mock.call.debug(
-                "Patching os.environ with: "
-                "{'COVERALLS_REPO_TOKEN': 'TOKEN', 'COVERALLS_PARALLEL': ''}"
-            ),
             mock.call.info("cd ."),
             mock.call.info(mock.ANY),
             mock.call.debug(json_response),
@@ -136,10 +132,6 @@ def test_run_coveralls_parallel(self):
         assert json_file["parallel"] == parallel
         assert m_log.method_calls == [
             mock.call.info("Trying submitting coverage with service_name: github..."),
-            mock.call.debug(
-                "Patching os.environ with: "
-                "{'COVERALLS_REPO_TOKEN': 'TOKEN', 'COVERALLS_PARALLEL': 'true'}"
-            ),
             mock.call.info("cd ."),
             mock.call.info(mock.ANY),
             mock.call.debug(json_response),
@@ -155,10 +147,6 @@ def test_run_coveralls_parallel(self):
         assert "parallel" not in json_file
         assert m_log.method_calls == [
             mock.call.info("Trying submitting coverage with service_name: github..."),
-            mock.call.debug(
-                "Patching os.environ with: "
-                "{'COVERALLS_REPO_TOKEN': 'TOKEN', 'COVERALLS_PARALLEL': ''}"
-            ),
             mock.call.info("cd ."),
             mock.call.info(mock.ANY),
             mock.call.debug(json_response),
@@ -183,14 +171,6 @@ def test_run_coveralls_flag_name(self):
         assert json_file["flag_name"] == flag_name
         assert m_log.method_calls == [
             mock.call.info("Trying submitting coverage with service_name: github..."),
-            mock.call.debug(
-                "Patching os.environ with: "
-                "{"
-                "'COVERALLS_REPO_TOKEN': 'TOKEN', "
-                "'COVERALLS_PARALLEL': '', "
-                "'COVERALLS_FLAG_NAME': 'Unit'"
-                "}"
-            ),
             mock.call.info("cd ."),
             mock.call.info(mock.ANY),
             mock.call.debug(json_response),
@@ -206,10 +186,6 @@ def test_run_coveralls_flag_name(self):
         assert "flag_name" not in json_file
         assert m_log.method_calls == [
             mock.call.info("Trying submitting coverage with service_name: github..."),
-            mock.call.debug(
-                "Patching os.environ with: "
-                "{'COVERALLS_REPO_TOKEN': 'TOKEN', 'COVERALLS_PARALLEL': ''}"
-            ),
             mock.call.info("cd ."),
             mock.call.info(mock.ANY),
             mock.call.debug(json_response),
@@ -229,10 +205,6 @@ def test_run_coveralls_wear_error_once(self):
         assert m_wear.call_args_list == [mock.call(), mock.call()]
         assert m_log.method_calls == [
             mock.call.info("Trying submitting coverage with service_name: github..."),
-            mock.call.debug(
-                "Patching os.environ with: "
-                "{'COVERALLS_REPO_TOKEN': 'TOKEN', 'COVERALLS_PARALLEL': ''}"
-            ),
             mock.call.info("cd ."),
             mock.call.warning(
                 "Failed submitting coverage with service_name: github",
@@ -242,10 +214,6 @@ def test_run_coveralls_wear_error_once(self):
             mock.call.info(
                 "Trying submitting coverage with service_name: github-actions..."
             ),
-            mock.call.debug(
-                "Patching os.environ with: "
-                "{'COVERALLS_REPO_TOKEN': 'TOKEN', 'COVERALLS_PARALLEL': ''}"
-            ),
             mock.call.info("cd ."),
             mock.call.info(mock.ANY),
             mock.call.debug(side_effect[1]),