From 4063e867c1d8de98c5c745f70e64cc41bfeafe12 Mon Sep 17 00:00:00 2001 From: mattip Date: Mon, 7 Dec 2020 22:07:59 +0200 Subject: [PATCH 1/5] TST: unbreak tests on FREEBSD --- Lib/test/test_sysconfig.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py index 352dbdea817e63..4417f762b00482 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py @@ -360,6 +360,7 @@ def test_SO_value(self): @unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None, 'EXT_SUFFIX required for this test') + @unittest.skipIf(sys.platform.startswith('freebsd')) def test_EXT_SUFFIX_in_vars(self): import _imp vars = sysconfig.get_config_vars() From d26267df00d6b0c7817159987efe9f25e465a02e Mon Sep 17 00:00:00 2001 From: mattip Date: Mon, 7 Dec 2020 23:39:14 +0200 Subject: [PATCH 2/5] TST: fix use of skipIf --- Lib/test/test_sysconfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py index 4417f762b00482..e6f6472037b624 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py @@ -360,7 +360,7 @@ def test_SO_value(self): @unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None, 'EXT_SUFFIX required for this test') - @unittest.skipIf(sys.platform.startswith('freebsd')) + @unittest.skipIf(sys.platform.startswith('freebsd'), "fails on FREEBSD") def test_EXT_SUFFIX_in_vars(self): import _imp vars = sysconfig.get_config_vars() From 9588cb1a92f882e56aeef0e0d9709c58d86bf37a Mon Sep 17 00:00:00 2001 From: mattip Date: Tue, 8 Dec 2020 00:06:14 +0200 Subject: [PATCH 3/5] TST: split out failing test and make conditional --- Lib/test/test_sysconfig.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py index e6f6472037b624..88985edd9c7a8f 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py @@ -360,12 +360,17 @@ def test_SO_value(self): @unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None, 'EXT_SUFFIX required for this test') - @unittest.skipIf(sys.platform.startswith('freebsd'), "fails on FREEBSD") def test_EXT_SUFFIX_in_vars(self): import _imp vars = sysconfig.get_config_vars() self.assertIsNotNone(vars['SO']) self.assertEqual(vars['SO'], vars['EXT_SUFFIX']) + + @unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None, + 'EXT_SUFFIX required for this test') + @unittest.skipIf(sys.platform.startswith('freebsd'), "fails on FREEBSD") + @unittest.skipIf(platform.system() =='AIX', "fails on AIX") + def test_EXT_SUFFIX_in_vars(self): self.assertEqual(vars['EXT_SUFFIX'], _imp.extension_suffixes()[0]) @unittest.skipUnless(sys.platform == 'linux' and From 2d0681d04175487679202755ac9862b5660f1100 Mon Sep 17 00:00:00 2001 From: mattip Date: Tue, 8 Dec 2020 00:38:06 +0200 Subject: [PATCH 4/5] TST: add missing import --- Lib/test/test_sysconfig.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py index 88985edd9c7a8f..0fc1ea7d6c9138 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py @@ -1,3 +1,4 @@ +import platform import unittest import sys import os From 4dbfcf9b7dbf1960b05cda7c7f50ad5eeba80bdb Mon Sep 17 00:00:00 2001 From: mattip Date: Tue, 8 Dec 2020 01:11:41 +0200 Subject: [PATCH 5/5] TST: fix test --- Lib/test/test_sysconfig.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py index 0fc1ea7d6c9138..962b0e4f041480 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py @@ -372,6 +372,8 @@ def test_EXT_SUFFIX_in_vars(self): @unittest.skipIf(sys.platform.startswith('freebsd'), "fails on FREEBSD") @unittest.skipIf(platform.system() =='AIX', "fails on AIX") def test_EXT_SUFFIX_in_vars(self): + import _imp + vars = sysconfig.get_config_vars() self.assertEqual(vars['EXT_SUFFIX'], _imp.extension_suffixes()[0]) @unittest.skipUnless(sys.platform == 'linux' and