Merge pull request #6123 from inspec/vasundhara/fix-windows-test-failure

Fix for error in the verify pipeline for Windows test

lib/inspec/resources/cassandradb_session.rb

@@ -1,10 +1,11 @@
 module Inspec::Resources
   class Lines
-    attr_reader :output
+    attr_reader :output, :exit_status
 
-    def initialize(raw, desc)
+    def initialize(raw, desc, exit_status)
       @output = raw
       @desc = desc
+      @exit_status = exit_status
     end
 
     def to_s
@@ -40,7 +41,7 @@ module Inspec::Resources
       if cmd.exit_status != 0 || out =~ /Unable to connect to any servers/ || out.downcase =~ /^error:.*/
         raise Inspec::Exceptions::ResourceFailed, "Cassandra query with errors: #{out}"
       else
-        Lines.new(cmd.stdout.strip, "Cassandra query: #{q}")
+        Lines.new(cmd.stdout.strip, "Cassandra query: #{q}", cmd.exit_status)
       end
     end
 

lib/inspec/resources/ibmdb2_session.rb

@@ -1,10 +1,11 @@
 module Inspec::Resources
   class Lines
-    attr_reader :output
+    attr_reader :output, :exit_status
 
-    def initialize(raw, desc)
+    def initialize(raw, desc, exit_status)
       @output = raw
       @desc = desc
+      @exit_status = exit_status
     end
 
     def to_s
@@ -58,7 +59,7 @@ module Inspec::Resources
       if cmd.exit_status != 0 || out =~ /Can't connect to IBM Db2 / || out.downcase =~ /^error:.*/
         raise Inspec::Exceptions::ResourceFailed, "IBM Db2 connection error: #{out}"
       else
-        Lines.new(cmd.stdout.strip, "IBM Db2 Query: #{q}")
+        Lines.new(cmd.stdout.strip, "IBM Db2 Query: #{q}", cmd.exit_status)
       end
     end
 

lib/inspec/resources/mongodb_session.rb

@@ -4,9 +4,10 @@ module Inspec::Resources
   class Lines
     attr_reader :params
 
-    def initialize(raw, desc)
+    def initialize(raw, desc, exit_status = nil)
       @params = raw
       @desc = desc
+      @exit_status = exit_status
     end
 
     def to_s

lib/inspec/resources/postgres_session.rb

@@ -4,9 +4,9 @@ require "shellwords" unless defined?(Shellwords)
 
 module Inspec::Resources
   class Lines
-    attr_reader :output
+    attr_reader :output, :exit_status
 
-    def initialize(raw, desc)
+    def initialize(raw, desc, exit_status)
       @output = raw
       @desc = desc
     end
@@ -58,9 +58,9 @@ module Inspec::Resources
       if cmd.exit_status != 0 && ( out =~ /could not connect to/ || out =~ /password authentication failed/ ) && out.downcase =~ /error:/
         raise Inspec::Exceptions::ResourceFailed, "PostgreSQL connection error: #{out}"
       elsif cmd.exit_status != 0 && out.downcase =~ /error:/
-        Lines.new(out, "PostgreSQL query with error: #{query}")
+        Lines.new(out, "PostgreSQL query with error: #{query}", cmd.exit_status)
       else
-        Lines.new(cmd.stdout.strip, "PostgreSQL query: #{query}")
+        Lines.new(cmd.stdout.strip, "PostgreSQL query: #{query}", cmd.exit_status)
       end
     end
 

test/functional/inspec_exec_test.rb

@@ -1179,7 +1179,7 @@ describe "inspec exec" do
       let(:cloud_profile) { cloud_path + "test-azure" }
       let(:args) { "-t azure://" }
       it "should fail to connect to azure due to lack of creds but not stacktrace" do
-        _(run_result.stderr).must_equal "Tenant id cannot be nil\n"
+        _(run_result.stderr).must_include "Tenant id cannot be nil\n"
       end
     end