diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py index 9155c40f405..80233a54b0b 100644 --- a/Lib/test/test_embed.py +++ b/Lib/test/test_embed.py @@ -4,11 +4,15 @@ import unittest from collections import namedtuple import os +import platform import re import subprocess import sys +# AIX libc prints an empty string as '' rather than the string '(null)' +NULL_STR = '' if platform.system() == 'AIX' else '(null)' + class EmbeddingTestsMixin: def setUp(self): here = os.path.abspath(__file__) @@ -258,7 +262,7 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase): 'use_environment': 1, 'use_hash_seed': 0, 'hash_seed': 0, - 'allocator': '(null)', + 'allocator': NULL_STR, 'dev_mode': 0, 'faulthandler': 0, 'tracemalloc': 0, @@ -276,11 +280,11 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase): 'coerce_c_locale': 0, 'coerce_c_locale_warn': 0, - 'pycache_prefix': '(null)', + 'pycache_prefix': NULL_STR, 'program_name': './_testembed', 'argc': 0, 'argv': '[]', - 'program': '(null)', + 'program': NULL_STR, 'isolated': 0, 'site_import': 1, diff --git a/Misc/NEWS.d/next/Tests/2018-09-04-15-16-42.bpo-34579.bp4HdM.rst b/Misc/NEWS.d/next/Tests/2018-09-04-15-16-42.bpo-34579.bp4HdM.rst new file mode 100644 index 00000000000..9e01cc9cb23 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2018-09-04-15-16-42.bpo-34579.bp4HdM.rst @@ -0,0 +1,2 @@ +Fix test_embed for AIX +Patch by Michael Felt