https://github.com/python/cpython/commit/2cf7d02b99ce8cebd26d330aa8aac2ee369... commit: 2cf7d02b99ce8cebd26d330aa8aac2ee369d4600 branch: main author: Hugo van Kemenade <hugovk@users.noreply.github.com> committer: Mariatta <Mariatta@users.noreply.github.com> date: 2021-12-30T16:16:27-08:00 summary: bpo-46178: Remove/rename redundant Travis CI code (#30309) files: M .azure-pipelines/posix-steps.yml M Doc/library/unittest.rst M Lib/test/test_urllib2net.py M README.rst M Tools/scripts/patchcheck.py diff --git a/.azure-pipelines/posix-steps.yml b/.azure-pipelines/posix-steps.yml index b6dde593019e6..2a3680897302e 100644 --- a/.azure-pipelines/posix-steps.yml +++ b/.azure-pipelines/posix-steps.yml @@ -66,7 +66,7 @@ steps: COMMAND: make - ${{ if eq(parameters.patchcheck, 'true') }}: - - script: ./python Tools/scripts/patchcheck.py --travis true + - script: ./python Tools/scripts/patchcheck.py --ci true displayName: 'Run patchcheck.py' condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest')) diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst index bf7a1e87928a6..22723f42d048f 100644 --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -72,8 +72,9 @@ test runner a GUI tool for test discovery and execution. This is intended largely for ease of use for those new to unit testing. For production environments it is recommended that tests be driven by a continuous integration system such as - `Buildbot <https://buildbot.net/>`_, `Jenkins <https://jenkins.io/>`_ - or `Travis-CI <https://travis-ci.com>`_, or `AppVeyor <https://www.appveyor.com/>`_. + `Buildbot <https://buildbot.net/>`_, `Jenkins <https://jenkins.io/>`_, + `GitHub Actions <https://github.com/features/actions>`_, or + `AppVeyor <https://www.appveyor.com/>`_. .. _unittest-minimal-example: diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py index aa41811560c78..04cfb492e4549 100644 --- a/Lib/test/test_urllib2net.py +++ b/Lib/test/test_urllib2net.py @@ -28,13 +28,6 @@ def wrapped(*args, **kwargs): return _retry_thrice(func, exc, *args, **kwargs) return wrapped -# bpo-35411: FTP tests of test_urllib2net randomly fail -# with "425 Security: Bad IP connecting" on Travis CI -skip_ftp_test_on_travis = unittest.skipIf('TRAVIS' in os.environ, - 'bpo-35411: skip FTP test ' - 'on Travis CI') - - # Connecting to remote hosts is flaky. Make it more robust by retrying # the connection several times. _urlopen_with_retry = _wrap_with_retry_thrice(urllib.request.urlopen, @@ -139,7 +132,6 @@ def setUp(self): # XXX The rest of these tests aren't very good -- they don't check much. # They do sometimes catch some major disasters, though. - @skip_ftp_test_on_travis def test_ftp(self): urls = [ 'ftp://www.pythontest.net/README', @@ -339,7 +331,6 @@ def test_http_timeout(self): FTP_HOST = 'ftp://www.pythontest.net/' - @skip_ftp_test_on_travis def test_ftp_basic(self): self.assertIsNone(socket.getdefaulttimeout()) with socket_helper.transient_internet(self.FTP_HOST, timeout=None): @@ -347,7 +338,6 @@ def test_ftp_basic(self): self.addCleanup(u.close) self.assertIsNone(u.fp.fp.raw._sock.gettimeout()) - @skip_ftp_test_on_travis def test_ftp_default_timeout(self): self.assertIsNone(socket.getdefaulttimeout()) with socket_helper.transient_internet(self.FTP_HOST): @@ -359,7 +349,6 @@ def test_ftp_default_timeout(self): socket.setdefaulttimeout(None) self.assertEqual(u.fp.fp.raw._sock.gettimeout(), 60) - @skip_ftp_test_on_travis def test_ftp_no_timeout(self): self.assertIsNone(socket.getdefaulttimeout()) with socket_helper.transient_internet(self.FTP_HOST): @@ -371,7 +360,6 @@ def test_ftp_no_timeout(self): socket.setdefaulttimeout(None) self.assertIsNone(u.fp.fp.raw._sock.gettimeout()) - @skip_ftp_test_on_travis def test_ftp_timeout(self): with socket_helper.transient_internet(self.FTP_HOST): u = _urlopen_with_retry(self.FTP_HOST, timeout=60) diff --git a/README.rst b/README.rst index 9f84432a55c97..d4b6621a80554 100644 --- a/README.rst +++ b/README.rst @@ -1,10 +1,6 @@ This is Python version 3.11.0 alpha 3 ===================================== -.. image:: https://travis-ci.com/python/cpython.svg?branch=main - :alt: CPython build status on Travis CI - :target: https://travis-ci.com/python/cpython - .. image:: https://github.com/python/cpython/workflows/Tests/badge.svg :alt: CPython build status on GitHub Actions :target: https://github.com/python/cpython/actions diff --git a/Tools/scripts/patchcheck.py b/Tools/scripts/patchcheck.py index 8e59c78a4c584..4cab66c8e97be 100755 --- a/Tools/scripts/patchcheck.py +++ b/Tools/scripts/patchcheck.py @@ -245,7 +245,7 @@ def regenerated_pyconfig_h_in(file_paths): else: return "not needed" -def travis(pull_request): +def ci(pull_request): if pull_request == 'false': print('Not a pull request; skipping') return @@ -301,10 +301,10 @@ def main(): if __name__ == '__main__': import argparse parser = argparse.ArgumentParser(description=__doc__) - parser.add_argument('--travis', + parser.add_argument('--ci', help='Perform pass/fail checks') args = parser.parse_args() - if args.travis: - travis(args.travis) + if args.ci: + ci(args.ci) else: main()