retry directory removal to work around Windows' inability to remove directories when you ask
This commit is contained in:
parent
08b8a2e6be
commit
0cbf05da49
@ -12,8 +12,27 @@ end
|
|||||||
describe Rscons do
|
describe Rscons do
|
||||||
BUILD_TEST_RUN_DIR = "build_test_run"
|
BUILD_TEST_RUN_DIR = "build_test_run"
|
||||||
|
|
||||||
|
def rm_rf(dir)
|
||||||
|
FileUtils.rm_rf(dir)
|
||||||
|
if File.exists?(dir)
|
||||||
|
sleep 0.2
|
||||||
|
FileUtils.rm_rf(dir)
|
||||||
|
if File.exists?(dir)
|
||||||
|
sleep 0.5
|
||||||
|
FileUtils.rm_rf(dir)
|
||||||
|
if File.exists?(dir)
|
||||||
|
sleep 1.0
|
||||||
|
FileUtils.rm_rf(dir)
|
||||||
|
if File.exists?(dir)
|
||||||
|
raise "Could not remove #{dir}"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
before(:all) do
|
before(:all) do
|
||||||
FileUtils.rm_rf(BUILD_TEST_RUN_DIR)
|
rm_rf(BUILD_TEST_RUN_DIR)
|
||||||
@owd = Dir.pwd
|
@owd = Dir.pwd
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -29,7 +48,7 @@ describe Rscons do
|
|||||||
|
|
||||||
after(:each) do
|
after(:each) do
|
||||||
Dir.chdir(@owd)
|
Dir.chdir(@owd)
|
||||||
FileUtils.rm_rf(BUILD_TEST_RUN_DIR)
|
rm_rf(BUILD_TEST_RUN_DIR)
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_dir(build_test_directory)
|
def test_dir(build_test_directory)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user