Merge pull request #267 from puppetlabs/healthcheck_windows

testing windows healthcheck cmd

Author: davejrt

manifests/run.pp

@@ -216,6 +216,7 @@
     $exec_path = ['c:/Windows/Temp/', 'C:/Program Files/Docker/']
     $exec_provider = 'powershell'
     $cidfile = "c:/Windows/Temp/${service_prefix}${sanitised_title}.cid"
+    $restart_check = "${docker_command} inspect ${sanitised_title} -f '{{ if eq \"unhealthy\" .State.Health.Status }} {{ .Name }}{{ end }}' | findstr ${sanitised_title}"
   } else {
     $exec_environment = 'HOME=/root'
     $exec_path = ['/bin', '/usr/bin']

spec/defines/run_spec.rb

@@ -579,8 +579,8 @@
       context 'with restart policy set to no' do
         let(:params) { {'restart' => 'no', 'command' => 'command', 'image' => 'base', 'extra_parameters' => '-c 4'} }
         it { should contain_exec('run sample with docker') }
-        it { should contain_exec('run sample with docker').with_unless(/\/var\/run\/docker-sample.cid/) }
-        it { should contain_exec('run sample with docker').with_unless(/-a/) }
+        it { should contain_exec('run sample with docker').with_unless(/sample/) }
+        it { should contain_exec('run sample with docker').with_unless(/inspect/) }
         it { should contain_exec('run sample with docker').with_command(/--cidfile=\/var\/run\/docker-sample.cid/) }
         it { should contain_exec('run sample with docker').with_command(/-c 4/) }
         it { should contain_exec('run sample with docker').with_command(/--restart="no"/) }
@@ -591,8 +591,8 @@
       context 'with restart policy set to always' do
         let(:params) { {'restart' => 'always', 'command' => 'command', 'image' => 'base', 'extra_parameters' => '-c 4'} }
         it { should contain_exec('run sample with docker') }
-        it { should contain_exec('run sample with docker').with_unless(/\/var\/run\/docker-sample.cid/) }
-        it { should contain_exec('run sample with docker').with_unless(/-a/) }
+        it { should contain_exec('run sample with docker').with_unless(/sample/) }
+        it { should contain_exec('run sample with docker').with_unless(/inspect/) }
         it { should contain_exec('run sample with docker').with_command(/--cidfile=\/var\/run\/docker-sample.cid/) }
         it { should contain_exec('run sample with docker').with_command(/-c 4/) }
         it { should contain_exec('run sample with docker').with_command(/--restart="always"/) }
@@ -603,8 +603,8 @@
       context 'with restart policy set to on-failure' do
         let(:params) { {'restart' => 'on-failure', 'command' => 'command', 'image' => 'base', 'extra_parameters' => '-c 4'} }
         it { should contain_exec('run sample with docker') }
-        it { should contain_exec('run sample with docker').with_unless(/\/var\/run\/docker-sample.cid/) }
-        it { should contain_exec('run sample with docker').with_unless(/-a/) }
+        it { should contain_exec('run sample with docker').with_unless(/sample/) }
+        it { should contain_exec('run sample with docker').with_unless(/inspect/) }
         it { should contain_exec('run sample with docker').with_command(/--cidfile=\/var\/run\/docker-sample.cid/) }
         it { should contain_exec('run sample with docker').with_command(/-c 4/) }
         it { should contain_exec('run sample with docker').with_command(/--restart="on-failure"/) }
@@ -615,8 +615,8 @@
       context 'with restart policy set to on-failure:3' do
         let(:params) { {'restart' => 'on-failure:3', 'command' => 'command', 'image' => 'base', 'extra_parameters' => '-c 4'} }
         it { should contain_exec('run sample with docker') }
-        it { should contain_exec('run sample with docker').with_unless(/\/var\/run\/docker-sample.cid/) }
-        it { should contain_exec('run sample with docker').with_unless(/-a/) }
+        it { should contain_exec('run sample with docker').with_unless(/sample/) }
+        it { should contain_exec('run sample with docker').with_unless(/inspect/) }
         it { should contain_exec('run sample with docker').with_command(/--cidfile=\/var\/run\/docker-sample.cid/) }
         it { should contain_exec('run sample with docker').with_command(/-c 4/) }
         it { should contain_exec('run sample with docker').with_command(/--restart="on-failure:3"/) }