Merge branch 'master' into dana/travis-ci

Author: dana-yaish

codecov_cli/helpers/ci_adapters/__init__.py

@@ -11,49 +11,20 @@
 from codecov_cli.helpers.ci_adapters.github_actions import GithubActionsCIAdapter
 from codecov_cli.helpers.ci_adapters.gitlab_ci import GitlabCIAdapter
 from codecov_cli.helpers.ci_adapters.heroku import HerokuCIAdapter
-from codecov_cli.helpers.ci_adapters.travis_ci import TravisCIAdapter
 from codecov_cli.helpers.ci_adapters.jenkins import JenkinsAdapter
 from codecov_cli.helpers.ci_adapters.local import LocalAdapter
 from codecov_cli.helpers.ci_adapters.teamcity import TeamcityAdapter
+from codecov_cli.helpers.ci_adapters.travis_ci import TravisCIAdapter
 from codecov_cli.helpers.ci_adapters.woodpeckerci import WoodpeckerCIAdapter
 
 logger = logging.getLogger("codecovcli")
 
 
 def get_ci_adapter(provider_name: str = None):
     if provider_name:
-        if provider_name == "circleci":
-            return CircleCICIAdapter()
-        if provider_name == "githubactions":
-            return GithubActionsCIAdapter()
-        if provider_name == "gitlabCI":
-            return GitlabCIAdapter()
-        if provider_name == "bitbucket":
-            return BitbucketAdapter()
-        if provider_name == "bitrise":
-            return BitriseCIAdapter()
-        if provider_name == "appveyor":
-            return AppveyorCIAdapter()
-        if provider_name == "local":
-            return LocalAdapter()
-        if provider_name == "woodpecker":
-            return WoodpeckerCIAdapter()
-        if provider_name == "teamcity":
-            return TeamcityAdapter()
-        if provider_name == "heroku":
-            return HerokuCIAdapter()
-        if provider_name == "droneci":
-            return DroneCIAdapter()
-        if provider_name == "buildkite":
-            return BuildkiteAdapter()
-        if provider_name == "azurepipelines":
-            return AzurePipelinesCIAdapter()
-        if provider_name == "jenkins":
-            return JenkinsAdapter()
-        if provider_name == "cirrusci":
-            return CirrusCIAdapter()
-        if provider_name == "travis":
-            return TravisCIAdapter()
+        for provider in get_ci_providers_list():
+            if provider.get_service_name().lower() == provider_name.lower():
+                return provider
     else:
         for provider in get_ci_providers_list():
             if provider.detect():

codecov_cli/helpers/ci_adapters/travis_ci.py

@@ -5,6 +5,12 @@
 
 class TravisCIAdapter(CIAdapterBase):
     # https://docs.travis-ci.com/user/environment-variables/#default-environment-variables
+    def detect(self) -> bool:
+        return (
+            bool(os.getenv("CI"))
+            and bool(os.getenv("TRAVIS"))
+            and not bool(os.getenv("SHIPPABLE"))
+        )
 
     def _get_commit_sha(self):
         return os.getenv("TRAVIS_PULL_REQUEST_SHA") or os.getenv("TRAVIS_COMMIT")
@@ -33,3 +39,6 @@ def _get_branch(self):
 
     def _get_service(self):
         return "travis"
+
+    def get_service_name(self):
+        return "Travis"

tests/ci_adapters/test_travis_ci.py

@@ -18,9 +18,35 @@ class TravisEnvEnum(str, Enum):
     TRAVIS_PULL_REQUEST_SHA = "TRAVIS_PULL_REQUEST_SHA"
     TRAVIS_PULL_REQUEST_BRANCH = "TRAVIS_PULL_REQUEST_BRANCH"
     TRAVIS_JOB_ID = "TRAVIS_JOB_ID"
+    CI = "CI"
+    TRAVIS = "TRAVIS"
+    SHIPPABLE = "SHIPPABLE"
 
 
 class TestTravisCIAdapter(object):
+    @pytest.mark.parametrize(
+        "env_dict,expected",
+        [
+            ({}, False),
+            (
+                {TravisEnvEnum.CI: "true", TravisEnvEnum.TRAVIS: "true"},
+                True,
+            ),
+            (
+                {
+                    TravisEnvEnum.CI: "true",
+                    TravisEnvEnum.TRAVIS: "true",
+                    TravisEnvEnum.SHIPPABLE: "true",
+                },
+                False,
+            ),
+        ],
+    )
+    def test_detect(self, env_dict, expected, mocker):
+        mocker.patch.dict(os.environ, env_dict)
+        actual = TravisCIAdapter().detect()
+        assert actual == expected
+
     @pytest.mark.parametrize(
         "env_dict,expected",
         [

tests/test_ci_adapter_selection.py

@@ -15,8 +15,8 @@
     JenkinsAdapter,
     LocalAdapter,
     TeamcityAdapter,
-    WoodpeckerCIAdapter,
     TravisCIAdapter,
+    WoodpeckerCIAdapter,
     get_ci_adapter,
 )