Skip to content

Commit cce0e55

Browse files
author
Daniel Carabas
committed
Update local acceptance helper and fix docker full spec
1 parent c397911 commit cce0e55

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

spec/acceptance/docker_full_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
docker_mount_path = 'C:/Users/Public/DockerVolume'
2424
storage_driver = 'windowsfilter'
2525
else
26-
docker_args = if os[:family] == 'RedHat'
26+
docker_args = if os[:family] == 'redhat'
2727
"repo_opt => '--enablerepo=localmirror-extras'"
2828
elsif os[:name] == 'Ubuntu' && os[:release][:full] == '14.04'
2929
"version => '18.06.1~ce~3-0~ubuntu'"

spec/spec_helper_acceptance_local.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def create_remote_file(name, full_name, file_content)
7171
run_shell('puppet module install puppetlabs-reboot --version 2.0.0', expect_failures: true)
7272

7373
# net-tools required for netstat utility being used by some tests
74-
if os[:family] == 'redhat' && os[:release].to_f == '7'
74+
if os[:family] == 'redhat' && os[:release].to_i == '7'
7575
run_shell('yum install -y net-tools device-mapper')
7676
end
7777

@@ -182,7 +182,7 @@ def create_remote_file(name, full_name, file_content)
182182
@windows_ip = ip
183183
end
184184
apply_manifest("class { 'docker': docker_ee => true, extra_parameters => '\"insecure-registries\": [ \"#{@windows_ip}:5000\" ]' }", catch_failures: true)
185-
docker_path = '/cygdrive/c/Program Files/Docker'
185+
docker_path = 'C:\\Program Files\\Docker'
186186
run_shell("set PATH \"%PATH%;C:\\Users\\Administrator\\AppData\\Local\\Temp;#{docker_path}\"")
187187
puts 'Waiting for box to come online'
188188
sleep 300

0 commit comments

Comments
 (0)