anon/cmdtest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pass new "chdir" tests

Browse Source
This commit is contained in:
Johan Holmberg 2015-06-15 21:22:17 +02:00
parent 43078cab8e
commit 8dce49ef45
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/cmdtest/testcase.rb
View File

@ -55,10 +55,10 @@ module Cmdtest
def setup def setup
end end
def teardown def teardown
end end
#------------------------------ #------------------------------
ORIG_CWD = Dir.pwd ORIG_CWD = Dir.pwd
@ -202,26 +202,39 @@ module Cmdtest
#------------------------------ #------------------------------
def current_directory def current_directory
@_cwd self._cwd
end
def _cwd
if @_runner.opts.parallel == 1
Dir.pwd
else
@_cwd
end
end
def _cwd=(dir)
if @_runner.opts.parallel == 1
Dir.chdir(dir)
else
@_cwd = dir
end
end end
#------------------------------ #------------------------------
def chdir(dir, &block) def chdir(dir, &block)
dir_path = File.expand_path(dir, @_cwd) dir_path = File.expand_path(dir, self._cwd)
if block_given? if block_given?
saved_cwd = @_cwd saved_cwd = self._cwd
@_cwd = dir_path self._cwd = dir_path
Dir.chdir(@_cwd) if @_runner.opts.parallel == 1
begin begin
yield yield
ensure ensure
@_cwd = saved_cwd self._cwd = saved_cwd
Dir.chdir(@_cwd) if @_runner.opts.parallel == 1
end end
else else
@_cwd = dir_path self._cwd = dir_path
Dir.chdir(@_cwd) if @_runner.opts.parallel == 1
end end
end end
@ -258,7 +271,7 @@ module Cmdtest
# of the call was started. # of the call was started.
def prepend_local_path(dir) def prepend_local_path(dir)
@_env_path.unshift(File.expand_path(dir, @_cwd)) @_env_path.unshift(File.expand_path(dir, self._cwd))
end end
#------------------------------ #------------------------------
@ -422,7 +435,7 @@ module Cmdtest
#------------------------------ #------------------------------
def _cwd_path(path) def _cwd_path(path)
File.expand_path(path, @_cwd) File.expand_path(path, self._cwd)
end end
#------------------------------ #------------------------------