Skip to content

Commit f40e986

Browse files
authored
Merge pull request rapid7#19612 from rapid7/revert-19554-new-junction-test
Revert "Added new failing test for windows junction points"
2 parents d9b3528 + 9485cdd commit f40e986

File tree

1 file changed

+0
-25
lines changed

1 file changed

+0
-25
lines changed

test/modules/post/test/file.rb

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -117,27 +117,6 @@ def test_dir
117117
ret
118118
end
119119
end
120-
121-
if (session.platform == 'windows')
122-
it 'should delete a junction target' do
123-
mkdir(datastore['BaseDirectoryName'])
124-
ret = directory?(datastore['BaseDirectoryName'])
125-
link = "#{datastore['BaseDirectoryName']}.junc"
126-
ret &&= write_file([datastore['BaseDirectoryName'], 'file'].join(fs_sep), '')
127-
make_junction(datastore['BaseDirectoryName'], link)
128-
unless exists?(link)
129-
print_error('failed to create the symbolic link')
130-
end
131-
rm_rf(link)
132-
# the link should have been deleted
133-
ret &&= !exists?(link)
134-
# but the target directory and its contents should still be intact
135-
ret &&= exists?("#{[datastore['BaseDirectoryName'], 'file'].join(fs_sep)}")
136-
rm_rf(datastore['BaseDirectoryName'])
137-
ret
138-
end
139-
end
140-
141120
end
142121

143122
def test_file
@@ -310,10 +289,6 @@ def test_path_expansion_nix
310289
end
311290
end
312291

313-
def make_junction(target, symlink)
314-
cmd_exec("cmd.exe", "/c mklink #{directory?(target) ? '/J ' : ''}#{symlink} #{target}")
315-
end
316-
317292
def make_symlink(target, symlink)
318293
if session.platform == 'windows'
319294
cmd_exec("cmd.exe", "/c mklink #{directory?(target) ? '/D ' : ''}#{symlink} #{target}")

0 commit comments

Comments
 (0)