Skip to content

Check for existing symlink while force creating symlink #1281

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

Merged
blackboxsw merged 1 commit into from
Feb 24, 2022
Merged

Check for existing symlink while force creating symlink #1281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cloudinit/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1886,7 +1886,7 @@ def is_link(path):

def sym_link(source, link, force=False):
LOG.debug("Creating symbolic link from %r => %r", link, source)
if force and os.path.exists(link):
if force and os.path.lexists(link):
del_file(link)
os.symlink(source, link)

Expand Down
46 changes: 46 additions & 0 deletions tests/unittests/test_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,52 @@ def test_mount_is_ro(self, m_mount_info):
self.assertEqual(is_rw, False)


class TestSymlink(CiTestCase):
def test_sym_link_simple(self):
tmpd = self.tmp_dir()
link = self.tmp_path("link", tmpd)
target = self.tmp_path("target", tmpd)
util.write_file(target, "hello")

util.sym_link(target, link)
self.assertTrue(os.path.exists(link))
self.assertTrue(os.path.islink(link))

def test_sym_link_source_exists(self):
tmpd = self.tmp_dir()
link = self.tmp_path("link", tmpd)
target = self.tmp_path("target", tmpd)
util.write_file(target, "hello")

util.sym_link(target, link)
self.assertTrue(os.path.exists(link))

util.sym_link(target, link, force=True)
self.assertTrue(os.path.exists(link))

def test_sym_link_dangling_link(self):
tmpd = self.tmp_dir()
link = self.tmp_path("link", tmpd)
target = self.tmp_path("target", tmpd)

util.sym_link(target, link)
self.assertTrue(os.path.islink(link))
self.assertFalse(os.path.exists(link))

util.sym_link(target, link, force=True)
self.assertTrue(os.path.islink(link))
self.assertFalse(os.path.exists(link))

def test_sym_link_create_dangling(self):
tmpd = self.tmp_dir()
link = self.tmp_path("link", tmpd)
target = self.tmp_path("target", tmpd)

util.sym_link(target, link)
self.assertTrue(os.path.islink(link))
self.assertFalse(os.path.exists(link))


class TestUptime(CiTestCase):
@mock.patch("cloudinit.util.boottime")
@mock.patch("cloudinit.util.os.path.exists")
Expand Down