Skip to content

Commit 3f09d92

Browse files
committed
Avoid mixing Linux and Windows path separator
1 parent e848283 commit 3f09d92

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Diff for: spec/acceptance/docker_params_changed_spec.rb

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
else
2424
docker_args = ''
2525
docker_network = 'bridge'
26-
volume_location = '/opt'
26+
volume_location = '/opt/'
2727
docker_image = 'hello-world:linux'
2828
end
2929

@@ -33,8 +33,8 @@
3333
install_pp = "class { 'docker': #{docker_args}}"
3434
apply_manifest(install_pp)
3535
end
36-
run_shell("mkdir #{volume_location}/volume_1")
37-
run_shell("mkdir #{volume_location}/volume_2")
36+
run_shell("mkdir #{volume_location}volume_1")
37+
run_shell("mkdir #{volume_location}volume_2")
3838
end
3939

4040
context 'when image is changed' do
@@ -78,8 +78,8 @@ class {'docker': #{docker_args}}
7878
volumes1 = "volumes => ['volume-1:C:\\volume_1']"
7979
volumes2 = "volumes => ['volume-1:C:\\volume_1', 'volume-2:C:\\volume_2']"
8080
else
81-
volumes1 = "volumes => ['volume-1:#{volume_location}/volume_1']"
82-
volumes2 = "volumes => ['volume-1:#{volume_location}/volume_1', 'volume-2:#{volume_location}/volume_2']"
81+
volumes1 = "volumes => ['volume-1:#{volume_location}volume_1']"
82+
volumes2 = "volumes => ['volume-1:#{volume_location}volume_1', 'volume-2:#{volume_location}volume_2']"
8383
end
8484

8585
let(:pp1) do
@@ -143,7 +143,7 @@ class {'docker': #{docker_args}}
143143
end
144144

145145
after(:all) do
146-
run_shell("rm -r #{volume_location}/volume_1")
147-
run_shell("rm -r #{volume_location}/volume_2")
146+
run_shell("rm -r #{volume_location}volume_1")
147+
run_shell("rm -r #{volume_location}volume_2")
148148
end
149149
end

0 commit comments

Comments
 (0)