summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_os.py
diff options
context:
space:
mode:
authorXavier de Gaye <xdegaye@users.sourceforge.net>2016-07-22 10:15:29 (GMT)
committerXavier de Gaye <xdegaye@users.sourceforge.net>2016-07-22 10:15:29 (GMT)
commitd141531eb5924159c58fcce779f78d7d04265f54 (patch)
tree9dfc1848978eed2d447e99df3e9abbec19af6cc9 /Lib/test/test_os.py
parentde85ed69f4935e639b911606d24d3382ae399b9c (diff)
downloadcpython-d141531eb5924159c58fcce779f78d7d04265f54.zip
cpython-d141531eb5924159c58fcce779f78d7d04265f54.tar.gz
cpython-d141531eb5924159c58fcce779f78d7d04265f54.tar.bz2
Issue #27472: Add test.support.unix_shell as the path to the default shell.
Diffstat (limited to 'Lib/test/test_os.py')
-rw-r--r--Lib/test/test_os.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 6493d76..aa9b538 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -64,6 +64,7 @@ except ImportError:
INT_MAX = PY_SSIZE_T_MAX = sys.maxsize
from test.support.script_helper import assert_python_ok
+from test.support import unix_shell
root_in_posix = False
@@ -670,18 +671,20 @@ class EnvironTests(mapping_tests.BasicTestMappingProtocol):
return os.environ
# Bug 1110478
- @unittest.skipUnless(os.path.exists('/bin/sh'), 'requires /bin/sh')
+ @unittest.skipUnless(unix_shell and os.path.exists(unix_shell),
+ 'requires a shell')
def test_update2(self):
os.environ.clear()
os.environ.update(HELLO="World")
- with os.popen("/bin/sh -c 'echo $HELLO'") as popen:
+ with os.popen("%s -c 'echo $HELLO'" % unix_shell) as popen:
value = popen.read().strip()
self.assertEqual(value, "World")
- @unittest.skipUnless(os.path.exists('/bin/sh'), 'requires /bin/sh')
+ @unittest.skipUnless(unix_shell and os.path.exists(unix_shell),
+ 'requires a shell')
def test_os_popen_iter(self):
- with os.popen(
- "/bin/sh -c 'echo \"line1\nline2\nline3\"'") as popen:
+ with os.popen("%s -c 'echo \"line1\nline2\nline3\"'"
+ % unix_shell) as popen:
it = iter(popen)
self.assertEqual(next(it), "line1\n")
self.assertEqual(next(it), "line2\n")