Skip to content
This repository was archived by the owner on May 21, 2025. It is now read-only.

Add $CODECOV_NAME as default for name #210

Closed
hugovk wants to merge 1 commit into from
Closed

Add $CODECOV_NAME as default for name #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion codecov/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ def main(*argv, **kwargs):
basics.add_argument('--flags', '-F', nargs="*", default=None, help="Flag these uploaded files with custom labels")
basics.add_argument('--env', '-e', nargs="*", default=None, help="Store environment variables to help distinguish CI builds.")
basics.add_argument('--required', action="store_true", default=False, help="If Codecov fails it will exit 1 - possibly failing the CI build.")
basics.add_argument('--name', '-n', default=None, help="Custom defined name of the upload. Visible in Codecov UI.")
basics.add_argument('--name', '-n', default=os.getenv("CODECOV_NAME"), help="Custom defined name of the upload. Visible in Codecov UI. Defaults to $CODECOV_NAME. Not required for public repositories on Travis CI, CircleCI and AppVeyor")

gcov = parser.add_argument_group('======================== gcov ========================')
gcov.add_argument('--gcov-root', default=None, help="Project root directory when preparing gcov")
Expand Down
67 changes: 52 additions & 15 deletions tests/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def setUp(self):
"BUILDKITE", "BUILDKITE_BUILD_NUMBER", "BUILDKITE_JOB_ID", "BUILDKITE_BRANCH", "BUILDKITE_PROJECT_SLUG", "BUILDKITE_COMMIT",
"DRONE", "DRONE_BRANCH", "DRONE_BUILD_DIR", "JENKINS_URL", "TRAVIS_TAG",
"GIT_BRANCH", "GIT_COMMIT", "WORKSPACE", "BUILD_NUMBER", "CI_BUILD_URL", "SEMAPHORE_REPO_SLUG", "SEMAPHORE_CURRENT_THREAD",
"DRONE_BUILD_LINK", "TRAVIS_REPO_SLUG", "CODECOV_TOKEN", "APPVEYOR", "APPVEYOR_REPO_BRANCH",
"DRONE_BUILD_LINK", "TRAVIS_REPO_SLUG", "CODECOV_TOKEN", "CODECOV_NAME", "APPVEYOR", "APPVEYOR_REPO_BRANCH",
"APPVEYOR_BUILD_VERSION", "APPVEYOR_JOB_ID", "APPVEYOR_REPO_NAME", "APPVEYOR_REPO_COMMIT", "WERCKER_GIT_BRANCH",
"WERCKER_MAIN_PIPELINE_STARTED", "WERCKER_GIT_OWNER", "WERCKER_GIT_REPOSITORY",
"CI_BUILD_REF_NAME", "CI_BUILD_ID", "CI_BUILD_REPO", "CI_PROJECT_DIR", "CI_BUILD_REF", "CI_SERVER_NAME",
Expand Down Expand Up @@ -246,7 +246,8 @@ 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 @@ -322,7 +323,9 @@ def test_ci_jenkins(self):
GIT_BRANCH='master',
GIT_COMMIT='c739768fcac68144a3a6d82305b9c4106934d31a',
BUILD_NUMBER='41',
CODECOV_TOKEN='token')
CODECOV_TOKEN='token',
CODECOV_NAME='name',
)
self.fake_report()
res = self.run_cli()
self.assertEqual(res['query']['service'], 'jenkins')
Expand All @@ -332,6 +335,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 @@ -341,7 +345,9 @@ def test_ci_jenkins_env(self):
ghprbActualCommit='c739768fcac68144a3a6d82305b9c4106934d31a',
ghprbPullId='1',
BUILD_NUMBER='41',
CODECOV_TOKEN='token')
CODECOV_TOKEN='token',
CODECOV_NAME='name',
)
self.fake_report()
res = self.run_cli()
self.assertEqual(res['query']['service'], 'jenkins')
Expand All @@ -351,6 +357,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 @@ -359,7 +366,9 @@ def test_ci_jenkins_blue_ocean(self):
BRANCH_NAME='master',
CHANGE_ID='1',
BUILD_NUMBER='41',
CODECOV_TOKEN='token')
CODECOV_TOKEN='token',
CODECOV_NAME='name',
)
self.fake_report()
res = self.run_cli()
self.assertEqual(res['query']['service'], 'jenkins')
Expand All @@ -369,6 +378,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'
and os.getenv('TRAVIS') == "true"
Expand Down Expand Up @@ -400,7 +410,9 @@ def test_ci_codeship(self):
CI_BUILD_NUMBER='20',
CI_BUILD_URL='https://codeship.io/build/1',
CI_COMMIT_ID='743b04806ea677403aa2ff26c6bdeb85005de658',
CODECOV_TOKEN='token')
CODECOV_TOKEN='token',
CODECOV_NAME='name',
)
self.fake_report()
res = self.run_cli()
self.assertEqual(res['query']['service'], 'codeship')
Expand All @@ -410,6 +422,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', 'Skip Circle CI test')
def test_ci_circleci(self):
Expand Down Expand Up @@ -439,7 +452,9 @@ def test_ci_buildkite(self):
BUILDKITE_BRANCH='master',
BUILDKITE_PROJECT_SLUG='owner/repo',
BUILDKITE_COMMIT='d653b934ed59c1a785cc1cc79d08c9aaa4eba73b',
CODECOV_TOKEN='token')
CODECOV_TOKEN='token',
CODECOV_NAME='name',
)
self.fake_report()
res = self.run_cli()
self.assertEqual(res['query']['service'], 'buildkite')
Expand All @@ -448,6 +463,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', 'Skip Semaphore CI test')
def test_ci_semaphore(self):
Expand All @@ -457,7 +473,9 @@ def test_ci_semaphore(self):
SEMAPHORE_CURRENT_THREAD='1',
SEMAPHORE_REPO_SLUG='owner/repo',
REVISION='743b04806ea677403aa2ff26c6bdeb85005de658',
CODECOV_TOKEN='token')
CODECOV_TOKEN='token',
CODECOV_NAME='name',
)
self.fake_report()
res = self.run_cli()
self.assertEqual(res['query']['service'], 'semaphore')
Expand All @@ -473,14 +491,17 @@ def test_ci_drone(self):
DRONE_BUILD_NUMBER='10',
DRONE_BRANCH='master',
DRONE_BUILD_LINK='https://drone.io/github/builds/1',
CODECOV_TOKEN='token')
CODECOV_TOKEN='token',
CODECOV_NAME='name',
)
self.fake_report()
res = self.run_cli()
self.assertEqual(res['query']['service'], 'drone.io')
self.assertEqual(res['query']['commit'], codecov.check_output(("git", "rev-parse", "HEAD")))
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 @@ -490,7 +511,9 @@ def test_ci_shippable(self):
BRANCH='master',
BUILD_URL='https://shippable.com/...',
COMMIT='743b04806ea677403aa2ff26c6bdeb85005de658',
CODECOV_TOKEN='token')
CODECOV_TOKEN='token',
CODECOV_NAME='name',
)
self.fake_report()
res = self.run_cli()
self.assertEqual(res['query']['service'], 'shippable')
Expand All @@ -499,6 +522,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 @@ -513,7 +537,9 @@ def test_ci_appveyor(self):
APPVEYOR_REPO_BRANCH='master',
APPVEYOR_REPO_NAME='owner/repo',
APPVEYOR_REPO_COMMIT='d653b934ed59c1a785cc1cc79d08c9aaa4eba73b',
CODECOV_TOKEN='token')
CODECOV_TOKEN='token',
CODECOV_NAME='name',
)
self.fake_report()
res = self.run_cli(file=self.filepath)
self.assertEqual(res['query']['service'], 'appveyor')
Expand All @@ -523,6 +549,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'), 'Skip Wercker CI test')
def test_ci_wercker(self):
Expand All @@ -531,14 +558,17 @@ def test_ci_wercker(self):
WERCKER_GIT_OWNER='owner',
WERCKER_GIT_REPOSITORY='repo',
WERCKER_GIT_COMMIT='d653b934ed59c1a785cc1cc79d08c9aaa4eba73b',
CODECOV_TOKEN='token')
CODECOV_TOKEN='token',
CODECOV_NAME='name',
)
self.fake_report()
res = self.run_cli()
self.assertEqual(res['query']['service'], 'wercker')
self.assertEqual(res['query']['commit'], 'd653b934ed59c1a785cc1cc79d08c9aaa4eba73b')
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', 'Skip Magnum CI test')
def test_ci_magnum(self):
Expand All @@ -547,13 +577,16 @@ def test_ci_magnum(self):
MAGNUM='true',
CI='true',
CI_COMMIT='d653b934ed59c1a785cc1cc79d08c9aaa4eba73b',
CODECOV_TOKEN='token')
CODECOV_TOKEN='token',
CODECOV_NAME='name',
)
self.fake_report()
res = self.run_cli()
self.assertEqual(res['query']['service'], 'magnum')
self.assertEqual(res['query']['commit'], 'd653b934ed59c1a785cc1cc79d08c9aaa4eba73b')
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')
def test_ci_gitlab(self):
Expand All @@ -564,18 +597,21 @@ def test_ci_gitlab(self):
CI_BUILD_REF='d653b934ed59c1a785cc1cc79d08c9aaa4eba73b',
HOME='/',
CI_PROJECT_DIR=os.getcwd().strip('/'),
CODECOV_TOKEN='token')
CODECOV_TOKEN='token',
CODECOV_NAME='name',
)
self.fake_report()
res = self.run_cli()
self.assertEqual(res['query']['service'], 'gitlab')
self.assertEqual(res['query']['commit'], 'd653b934ed59c1a785cc1cc79d08c9aaa4eba73b')
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.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,
commit='d653b934ed59c1a785cc1cc79d08c9aaa4eba73b',
Expand All @@ -586,3 +622,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')