From: Michael Felt <aixtools@users.noreply.github.com>
Date: Sat, 15 Sep 2018 09:28:31 +0000 (+0200)
Subject: bpo-34579: Fix test_embed DEFAULT_CON AIX (GH-9063)
X-Git-Tag: v3.8.0a1~975
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2067318c79f66cfdabc53333715a02d5fa5ff81;p=thirdparty%2FPython%2Fcpython.git

bpo-34579: Fix test_embed DEFAULT_CON AIX (GH-9063)

* Modify DEFAULT_CONFIG for AIX

* bedevere/news did not like old name

* Modify NEWS entry

* Modified per peer review

* Define and use NULL_STR constant to account for AIX libc behavior

* Modify per peer review

* Modify NEWS
---

diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
index 9155c40f405e..80233a54b0b0 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 000000000000..9e01cc9cb232
--- /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