Skip to content

fix test_add_and_remove_module_path by replacing string comparison of paths by checking whether they point to the same path (since symlinks may cause trouble) #4312

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
ocaisa merged 1 commit into from
Aug 7, 2023
Merged

fix test_add_and_remove_module_path by replacing string comparison of paths by checking whether they point to the same path (since symlinks may cause trouble) #4312

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
23 changes: 16 additions & 7 deletions test/framework/modules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1273,24 +1273,33 @@ def get_resolved_module_path():
test_dir1_relative = os.path.join(test_dir1, '..', os.path.basename(test_dir1))
test_dir2_dot = os.path.join(os.path.dirname(test_dir2), '.', os.path.basename(test_dir2))
self.modtool.add_module_path(test_dir1_relative)
self.assertEqual(get_resolved_module_path(), test_dir1)
self.assertTrue(os.path.samefile(get_resolved_module_path(), test_dir1))
# Adding the same path, but in a different form may be possible, but may also be ignored, e.g. in EnvModules
self.modtool.add_module_path(test_dir1)
if get_resolved_module_path() != test_dir1:
self.assertEqual(get_resolved_module_path(), os.pathsep.join([test_dir1, test_dir1]))
modpath = get_resolved_module_path().split(os.pathsep)
self.assertEqual(len(modpath), 2)
self.assertTrue(os.path.samefile(modpath[0], test_dir1))
self.assertTrue(os.path.samefile(modpath[1], test_dir1))
self.modtool.remove_module_path(test_dir1)
self.assertEqual(get_resolved_module_path(), test_dir1)
self.assertTrue(os.path.samefile(get_resolved_module_path(), test_dir1))

self.modtool.add_module_path(test_dir2_dot)
self.assertEqual(get_resolved_module_path(), test_dir_2_and_1)
modpath = get_resolved_module_path().split(os.pathsep)
self.assertEqual(len(modpath), 2)
self.assertTrue(os.path.samefile(modpath[0], test_dir2))
self.assertTrue(os.path.samefile(modpath[1], test_dir1))

self.modtool.remove_module_path(test_dir2_dot)
self.assertEqual(get_resolved_module_path(), test_dir1)
self.assertTrue(os.path.samefile(get_resolved_module_path(), test_dir1))

# Force adding such a dot path which can be removed with either variant
os.environ['MODULEPATH'] = os.pathsep.join([test_dir2_dot, test_dir1_relative])
self.modtool.remove_module_path(test_dir2_dot)
self.assertEqual(get_resolved_module_path(), test_dir1)
self.assertTrue(os.path.samefile(get_resolved_module_path(), test_dir1))
os.environ['MODULEPATH'] = os.pathsep.join([test_dir2_dot, test_dir1_relative])
self.modtool.remove_module_path(test_dir2)
self.assertEqual(get_resolved_module_path(), test_dir1)
self.assertTrue(os.path.samefile(get_resolved_module_path(), test_dir1))

os.environ['MODULEPATH'] = old_module_path # Restore

Expand Down