Skip to content
This repository has been archived by the owner on Apr 20, 2023. It is now read-only.

Commit

Permalink
Add CODECOV_NAME as default for name (#267)
Browse files Browse the repository at this point in the history
Co-authored-by: Hugo <hugovk@users.noreply.github.com>
  • Loading branch information
nmoinvaz and hugovk committed Jun 6, 2020
1 parent 1f5f6b9 commit 39100a2
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 4 deletions.
4 changes: 2 additions & 2 deletions codecov/__init__.py
Expand Up @@ -342,8 +342,8 @@ def main(*argv, **kwargs):
basics.add_argument(
"--name",
"-n",
default=None,
help="Custom defined name of the upload. Visible in Codecov UI.",
default=os.getenv("CODECOV_NAME"),
help="Custom defined name of the upload. Visible in Codecov UI. Defaults to $CODECOV_NAME.",
)

gcov = parser.add_argument_group(
Expand Down
35 changes: 33 additions & 2 deletions tests/test.py
Expand Up @@ -82,6 +82,7 @@ def setUp(self):
"DRONE_BUILD_LINK",
"TRAVIS_REPO_SLUG",
"CODECOV_TOKEN",
"CODECOV_NAME",
"APPVEYOR",
"APPVEYOR_REPO_BRANCH",
"APPVEYOR_BUILD_VERSION",
Expand Down Expand Up @@ -394,7 +395,13 @@ def test_gcov(self):
# self.skipTest("Skipped, works on Travis only.")

def test_disable_detect(self):
self.set_env(JENKINS_URL="a", GIT_BRANCH="b", GIT_COMMIT="c", CODECOV_TOKEN="d")
self.set_env(
JENKINS_URL="a",
GIT_BRANCH="b",
GIT_COMMIT="c",
CODECOV_TOKEN="d",
CODECOV_NAME="e",
)
self.fake_report()
try:
self.run_cli(disable="detect")
Expand Down Expand Up @@ -486,6 +493,7 @@ def test_ci_jenkins(self):
GIT_COMMIT="c739768fcac68144a3a6d82305b9c4106934d31a",
BUILD_NUMBER="41",
CODECOV_TOKEN="token",
CODECOV_NAME="name",
)
self.fake_report()
res = self.run_cli()
Expand All @@ -498,6 +506,7 @@ def test_ci_jenkins(self):
self.assertEqual(res["query"]["pr"], "")
self.assertEqual(res["query"]["branch"], "master")
self.assertEqual(res["codecov"].token, "token")
self.assertEqual(res["codecov"].name, "name")

@unittest.skipUnless(os.getenv("JENKINS_URL"), "Skip Jenkins CI test")
def test_ci_jenkins_env(self):
Expand All @@ -509,6 +518,7 @@ def test_ci_jenkins_env(self):
ghprbPullId="1",
BUILD_NUMBER="41",
CODECOV_TOKEN="token",
CODECOV_NAME="name",
)
self.fake_report()
res = self.run_cli()
Expand All @@ -521,6 +531,7 @@ def test_ci_jenkins_env(self):
self.assertEqual(res["query"]["pr"], "1")
self.assertEqual(res["query"]["branch"], "master")
self.assertEqual(res["codecov"].token, "token")
self.assertEqual(res["codecov"].name, "name")

@unittest.skipUnless(os.getenv("JENKINS_URL"), "Skip Jenkins CI test")
def test_ci_jenkins_blue_ocean(self):
Expand All @@ -531,6 +542,7 @@ def test_ci_jenkins_blue_ocean(self):
CHANGE_ID="1",
BUILD_NUMBER="41",
CODECOV_TOKEN="token",
CODECOV_NAME="name",
)
self.fake_report()
res = self.run_cli()
Expand All @@ -543,6 +555,7 @@ def test_ci_jenkins_blue_ocean(self):
self.assertEqual(res["query"]["pr"], "1")
self.assertEqual(res["query"]["branch"], "master")
self.assertEqual(res["codecov"].token, "token")
self.assertEqual(res["codecov"].name, "name")

@unittest.skipUnless(
os.getenv("CI") == "true"
Expand Down Expand Up @@ -585,6 +598,7 @@ def test_ci_codeship(self):
CI_BUILD_URL="https://codeship.io/build/1",
CI_COMMIT_ID="743b04806ea677403aa2ff26c6bdeb85005de658",
CODECOV_TOKEN="token",
CODECOV_NAME="name",
)
self.fake_report()
res = self.run_cli()
Expand All @@ -597,6 +611,7 @@ def test_ci_codeship(self):
self.assertEqual(res["query"]["pr"], "")
self.assertEqual(res["query"]["branch"], "master")
self.assertEqual(res["codecov"].token, "token")
self.assertEqual(res["codecov"].name, "name")

@unittest.skipUnless(
os.getenv("CI") == "true" and os.getenv("CIRCLECI") == "true",
Expand Down Expand Up @@ -638,6 +653,7 @@ def test_ci_buildkite(self):
BUILDKITE_PROJECT_SLUG="owner/repo",
BUILDKITE_COMMIT="d653b934ed59c1a785cc1cc79d08c9aaa4eba73b",
CODECOV_TOKEN="token",
CODECOV_NAME="name",
)
self.fake_report()
res = self.run_cli()
Expand All @@ -649,6 +665,7 @@ def test_ci_buildkite(self):
self.assertEqual(res["query"]["slug"], "owner/repo")
self.assertEqual(res["query"]["branch"], "master")
self.assertEqual(res["codecov"].token, "token")
self.assertEqual(res["codecov"].name, "name")

@unittest.skipUnless(
os.getenv("CI") == "true" and os.getenv("SEMAPHORE") == "true",
Expand All @@ -663,6 +680,7 @@ def test_ci_semaphore(self):
SEMAPHORE_REPO_SLUG="owner/repo",
REVISION="743b04806ea677403aa2ff26c6bdeb85005de658",
CODECOV_TOKEN="token",
CODECOV_NAME="name",
)
self.fake_report()
res = self.run_cli()
Expand All @@ -686,6 +704,7 @@ def test_ci_drone(self):
DRONE_BRANCH="master",
DRONE_BUILD_LINK="https://drone.io/github/builds/1",
CODECOV_TOKEN="token",
CODECOV_NAME="name",
)
self.fake_report()
res = self.run_cli()
Expand All @@ -696,6 +715,7 @@ def test_ci_drone(self):
self.assertEqual(res["query"]["build"], "10")
self.assertEqual(res["query"]["build_url"], "https://drone.io/github/builds/1")
self.assertEqual(res["codecov"].token, "token")
self.assertEqual(res["codecov"].name, "name")

@unittest.skipUnless(os.getenv("SHIPPABLE") == "true", "Skip Shippable CI test")
def test_ci_shippable(self):
Expand All @@ -707,6 +727,7 @@ def test_ci_shippable(self):
BUILD_URL="https://shippable.com/...",
COMMIT="743b04806ea677403aa2ff26c6bdeb85005de658",
CODECOV_TOKEN="token",
CODECOV_NAME="name",
)
self.fake_report()
res = self.run_cli()
Expand All @@ -718,6 +739,7 @@ def test_ci_shippable(self):
self.assertEqual(res["query"]["slug"], "owner/repo")
self.assertEqual(res["query"]["build_url"], "https://shippable.com/...")
self.assertEqual(res["codecov"].token, "token")
self.assertEqual(res["codecov"].name, "name")

# @unittest.skipUnless(os.getenv('CI') == "True" and os.getenv('APPVEYOR') == 'True', 'Skip AppVeyor CI test')
@unittest.skip("Skip AppVeyor test")
Expand All @@ -734,6 +756,7 @@ def test_ci_appveyor(self):
APPVEYOR_REPO_NAME="owner/repo",
APPVEYOR_REPO_COMMIT="d653b934ed59c1a785cc1cc79d08c9aaa4eba73b",
CODECOV_TOKEN="token",
CODECOV_NAME="name",
)
self.fake_report()
res = self.run_cli(file=self.filepath)
Expand All @@ -746,6 +769,7 @@ def test_ci_appveyor(self):
self.assertEqual(res["query"]["slug"], "owner/repo")
self.assertEqual(res["query"]["pr"], "1")
self.assertEqual(res["codecov"].token, "token")
self.assertEqual(res["codecov"].name, "name")

@unittest.skipUnless(
os.getenv("CI") == "true" and os.getenv("WERCKER_GIT_BRANCH"),
Expand All @@ -759,6 +783,7 @@ def test_ci_wercker(self):
WERCKER_GIT_REPOSITORY="repo",
WERCKER_GIT_COMMIT="d653b934ed59c1a785cc1cc79d08c9aaa4eba73b",
CODECOV_TOKEN="token",
CODECOV_NAME="name",
)
self.fake_report()
res = self.run_cli()
Expand All @@ -769,6 +794,7 @@ def test_ci_wercker(self):
self.assertEqual(res["query"]["build"], "1399372237")
self.assertEqual(res["query"]["slug"], "owner/repo")
self.assertEqual(res["codecov"].token, "token")
self.assertEqual(res["codecov"].name, "name")

@unittest.skipUnless(
os.getenv("CI") == "true" and os.getenv("MAGNUM") == "true",
Expand All @@ -782,6 +808,7 @@ def test_ci_magnum(self):
CI="true",
CI_COMMIT="d653b934ed59c1a785cc1cc79d08c9aaa4eba73b",
CODECOV_TOKEN="token",
CODECOV_NAME="name",
)
self.fake_report()
res = self.run_cli()
Expand All @@ -791,6 +818,7 @@ def test_ci_magnum(self):
)
self.assertEqual(res["query"]["build"], "1399372237")
self.assertEqual(res["codecov"].token, "token")
self.assertEqual(res["codecov"].name, "name")

@unittest.skipUnless(
os.getenv("CI_SERVER_NAME", "").startswith("GitLab"), "Skip GitLab CI test"
Expand All @@ -805,6 +833,7 @@ def test_ci_gitlab_pre9(self):
HOME="/",
CI_PROJECT_DIR=os.getcwd().strip("/"),
CODECOV_TOKEN="token",
CODECOV_NAME="name",
)
self.fake_report()
res = self.run_cli()
Expand All @@ -815,6 +844,7 @@ def test_ci_gitlab_pre9(self):
self.assertEqual(res["query"]["build"], "1399372237")
self.assertEqual(res["query"]["slug"], "owner/repo")
self.assertEqual(res["codecov"].token, "token")
self.assertEqual(res["codecov"].name, "name")

@unittest.skipUnless(
os.getenv("CI_SERVER_NAME", "").startswith("GitLab"), "Skip GitLab CI test"
Expand Down Expand Up @@ -842,7 +872,7 @@ def test_ci_gitlab(self):

@unittest.skip("Skip CI None")
def test_ci_none(self):
self.set_env(CODECOV_TOKEN="token")
self.set_env(CODECOV_TOKEN="token", CODECOV_NAME="name")
self.fake_report()
res = self.run_cli(
build=10,
Expand All @@ -857,3 +887,4 @@ def test_ci_none(self):
self.assertEqual(res["query"]["build"], "10")
self.assertEqual(res["query"]["slug"], "owner/repo")
self.assertEqual(res["codecov"].token, "token")
self.assertEqual(res["codecov"].name, "name")

0 comments on commit 39100a2

Please sign in to comment.