Skip to content

bpo-1154351: Add get_current_dir_name() to os module #10117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bradengroom wants to merge 9 commits into from
Closed

bpo-1154351: Add get_current_dir_name() to os module #10117

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1daae93
bpo-1154351: add get_current_dir_name() to os module
bradengroom Oct 26, 2018
ee4c4f6
fixup! bpo-1154351: add get_current_dir_name() to os module
bradengroom Oct 26, 2018
f836691
fixup! bpo-1154351: add get_current_dir_name() to os module
bradengroom Oct 26, 2018
89e1984
fixup! bpo-1154351: add get_current_dir_name() to os module
bradengroom Oct 26, 2018
4bfb33c
fixup! bpo-1154351: add get_current_dir_name() to os module
bradengroom Oct 27, 2018
963659a
fixup! bpo-1154351: add get_current_dir_name() to os module
bradengroom Oct 27, 2018
cc1735f
fixup! bpo-1154351: add get_current_dir_name() to os module
bradengroom Oct 27, 2018
d49fdf3
fixup! bpo-1154351: add get_current_dir_name() to os module
bradengroom Oct 27, 2018
17386e1
fixup! bpo-1154351: add get_current_dir_name() to os module
bradengroom Oct 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup! bpo-1154351: add get_current_dir_name() to os module
  • Loading branch information
@bradengroom
bradengroom committed Oct 26, 2018
commit 89e1984c064251740f5871b34ed1b9b3a819fe5a
29 changes: 12 additions & 17 deletions Lib/test/test_os.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import uuid
import warnings
from test import support
from unittest import mock

try:
import resource
Expand Down Expand Up @@ -1255,7 +1256,6 @@ def tearDownClass(cls):
class CurrentDirTests(unittest.TestCase):

def setUp(self):
self.pwd = os.environ.get('PWD')
base = os.path.abspath(support.TESTFN)
self.tmp_dir = base + '_dir'
self.tmp_lnk = base + '_lnk'
Expand All @@ -1268,32 +1268,27 @@ def test_getcwd(self):
os.symlink(self.tmp_dir, self.tmp_lnk, True)
os.chdir(self.tmp_lnk)
self.assertEqual(self.tmp_dir, os.getcwd())
os.environ['PWD'] = self.tmp_dir
self.assertEqual(self.tmp_dir, os.getcwd())
os.environ['PWD'] = self.tmp_lnk
self.assertEqual(self.tmp_dir, os.getcwd())
with mock.patch.dict('os.environ', {'PWD': self.tmp_dir}):
self.assertEqual(self.tmp_dir, os.getcwd())
with mock.patch.dict('os.environ', {'PWD': self.tmp_lnk}):
self.assertEqual(self.tmp_dir, os.getcwd())
os.unlink(self.tmp_lnk)
Copy link
Copy Markdown
Member

@serhiy-storchaka serhiy-storchaka Oct 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The link will be leaked in the case of failure. It is better to use addCleanup(). Add the following line just before creating a link.

self.addCleanup(support.unlink, self.tmp_lnk)


def test_get_current_dir_name(self):
# os.get_current_dir_name() returns the direct path--mirroring
# the PWD environment variable if it exists regardless of
# whether the path contains symlinks.
with support.temp_cwd(self.tmp_dir):
os.environ['PWD'] = self.tmp_dir
self.assertEqual(self.tmp_dir, os.get_current_dir_name())
os.symlink(self.tmp_dir, self.tmp_lnk, True)
if os.name == 'posix':
os.environ['PWD'] = self.tmp_lnk
self.assertEqual(self.tmp_lnk, os.get_current_dir_name())
else:
os.environ['PWD'] = self.tmp_lnk
with mock.patch.dict('os.environ', {'PWD': self.tmp_dir}):
self.assertEqual(self.tmp_dir, os.get_current_dir_name())
os.symlink(self.tmp_dir, self.tmp_lnk, True)
with mock.patch.dict('os.environ', {'PWD': self.tmp_lnk}):
if os.name == 'posix':
self.assertEqual(self.tmp_lnk, os.get_current_dir_name())
else:
self.assertEqual(self.tmp_dir, os.get_current_dir_name())
os.unlink(self.tmp_lnk)

def tearDown(self):
if self.pwd is not None:
os.environ['PWD'] = self.pwd


class RemoveDirsTests(unittest.TestCase):
def setUp(self):
Expand Down