From 65a5eff67474703329477b070d9c081fee17c69c Mon Sep 17 00:00:00 2001
From: "Miss Islington (bot)"
 <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 4 Dec 2018 17:18:57 -0800
Subject: bpo-35411: Skip test_urllib2net FTP tests on Travis CI (GH-10907)
 (GH-10909)

On Travis CI, FTP tests of test_urllib2net randomly fail with "425
Security: Bad IP connecting".

test.pythoninfo now also logs TRAVIS environment variable.
(cherry picked from commit c11b3b19a5b022c6c229043d37f9a9fd06f22500)

Co-authored-by: Victor Stinner <vstinner@redhat.com>
---
 Lib/test/pythoninfo.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Lib/test/pythoninfo.py')

diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py
index 606d511433..c453340b80 100644
--- a/Lib/test/pythoninfo.py
+++ b/Lib/test/pythoninfo.py
@@ -256,6 +256,7 @@ def collect_os(info_add):
         "TIX_LIBRARY",
         "TMP",
         "TMPDIR",
+        "TRAVIS",
         "TZ",
         "USERPROFILE",
         "VIRTUAL_ENV",
-- 
cgit v1.2.1