Fix kitchen doctor Acceptance (#497)

* Increase doctor code coverage

* Fail doctor task if issues aren't detected

* Use doctor Rake task in acceptance

* Add missing OS to doctor task invocation

---------

Co-authored-by: Aaron Lane <2400330-aaron-lane@users.noreply.gitlab.com>

.github/workflows/delivery.yml

@@ -121,19 +121,7 @@ jobs:
           rake test:kitchen:backend-ssh-ubuntu
       - name: Run Kitchen doctor
         run: |
-          status=0
-          output="$(rake test:kitchen:doctor-${{ matrix.operating-system }})"
-          if [[ $output != *"${{ matrix.operating-system }}.driver.client"* ]]
-          then
-            echo "kitchen doctor did not detect driver.client error"
-            status=1
-          fi
-          if [[ $output != *"${{ matrix.operating-system }}.verifier.systems"* ]]
-          then
-            echo "kitchen doctor did not detect verifier.systems error"
-            status=1
-          fi
-          exit $status
+          rake test:kitchen:doctor-${{ matrix.operating-system }}
 
   release:
     name: "Release"

spec/lib/kitchen/terraform/driver/doctor_spec.rb

@@ -47,7 +47,7 @@
         }
       end
 
-      specify "should raise a user error" do
+      specify "should return true" do
         expect(subject.call(config: config)).to be_truthy
       end
 
@@ -58,5 +58,18 @@
         end
       end
     end
+
+    context "when the configured client does exist and is executable" do
+      let :config do
+        {
+          # Use the current executable
+          client: $0
+        }
+      end
+
+      specify "should return false" do
+        expect(subject.call(config: config)).to be_falsey
+      end
+    end
   end
 end

spec/lib/kitchen/terraform/verifier/doctor_spec.rb

@@ -15,6 +15,7 @@
 # limitations under the License.
 
 require "kitchen"
+require "kitchen/terraform/system"
 require "kitchen/terraform/verifier/doctor"
 require "tempfile"
 
@@ -39,5 +40,19 @@
         expect(subject.call(config: config)).to be_truthy
       end
     end
+
+    context "when the configured systems are not empty" do
+      let :config do
+        {
+          systems: [
+            ::Kitchen::Terraform::System.new(configuration_attributes: {}, logger: logger)
+          ]
+        }
+      end
+
+      specify "should return false" do
+        expect(subject.call(config: config)).to be_falsey
+      end
+    end
   end
 end

test/kitchen/terraform/rake_tasks.rb

@@ -37,7 +37,9 @@ def define_doctor
           end.each_pair do |platform_name, instances|
             desc "Run doctor-#{platform_name} test"
             task "doctor-#{platform_name}" do
-              instances.each_entry(&:doctor_action)
+              instances.each_entry do |instance|
+                instance.doctor_action or raise "doctor did not detect an issue"
+              end
             end
           end
         end