Skip to content

Commit 090dac6

Browse files
committed
make the stdapi_fs_file_move test unconditional
1 parent 94a1592 commit 090dac6

File tree

1 file changed

+21
-22
lines changed

1 file changed

+21
-22
lines changed

test/modules/post/test/meterpreter.rb

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -251,31 +251,30 @@ def test_fs
251251
session.fs.file.rm(remote)
252252
res
253253
end
254-
if session.commands.include?("stdapi_fs_file_move")
255-
it "should move files" do
256-
res = true
257-
src_name = datastore["BaseFileName"]
258-
dst_name = "#{datastore["BaseFileName"]}-moved"
259-
260-
# Make sure we don't have leftovers from a previous run
261-
session.fs.file.rm(src_name) rescue nil
262-
session.fs.file.rm(dst_name) rescue nil
263-
264-
# touch a new file
265-
fd = session.fs.file.open(src_name, "wb")
266-
fd.close
267254

268-
session.fs.file.mv(src_name, dst_name)
269-
entries = session.fs.dir.entries
270-
res &&= entries.include?(dst_name)
271-
res &&= !entries.include?(src_name)
255+
it "should move files" do
256+
res = true
257+
src_name = datastore["BaseFileName"]
258+
dst_name = "#{datastore["BaseFileName"]}-moved"
272259

273-
# clean up
274-
session.fs.file.rm(src_name) rescue nil
275-
session.fs.file.rm(dst_name) rescue nil
260+
# Make sure we don't have leftovers from a previous run
261+
session.fs.file.rm(src_name) rescue nil
262+
session.fs.file.rm(dst_name) rescue nil
276263

277-
res
278-
end
264+
# touch a new file
265+
fd = session.fs.file.open(src_name, "wb")
266+
fd.close
267+
268+
session.fs.file.mv(src_name, dst_name)
269+
entries = session.fs.dir.entries
270+
res &&= entries.include?(dst_name)
271+
res &&= !entries.include?(src_name)
272+
273+
# clean up
274+
session.fs.file.rm(src_name) rescue nil
275+
session.fs.file.rm(dst_name) rescue nil
276+
277+
res
279278
end
280279

281280
it "should copy files" do

0 commit comments

Comments
 (0)