Fix error messages and tests for catalog validators

Author: kpaulisse

lib/octocatalog-diff/util/catalogs.rb

@@ -231,11 +231,11 @@ def build_catalog(opts, logger = @logger)
       # @param catalog [OctocatalogDiff::Catalog] Catalog object
       # @param logger [Logger] Logger object (presently unused)
       # @param args [Hash] Additional arguments set specifically for validator
-      # @return [Boolean] true if catalog is valid, false otherwise
       def catalog_validator(catalog = nil, _logger = @logger, args = {})
         return false unless catalog.is_a?(OctocatalogDiff::Catalog)
         catalog.validate_references if args[:task] == :to
-        catalog.valid?
+        return if catalog.valid?
+        raise OctocatalogDiff::Errors::CatalogError, 'Catalog failed: Invalid catalog'
       end
     end
   end

lib/octocatalog-diff/util/parallel.rb

@@ -152,7 +152,10 @@ def self.run_tasks_serial(result, task_array, logger)
         task_array.each_with_index do |ele, task_counter|
           result[task_counter] = execute_task(ele, logger)
           next if result[task_counter].status
-          raise result[task_counter].exception
+          raise result[task_counter].exception if result[task_counter].exception
+          # :nocov:
+          raise "Serial task #{task_counter} had status=#{result[task_counter].status} but no exception was set"
+          # :nocov:
         end
       end
 
@@ -171,12 +174,7 @@ def self.execute_task(task, logger)
         end
 
         begin
-          if task.validate(output, logger)
-            logger.debug("Success #{task.description}")
-          else
-            logger.warn("Failed #{task.description}")
-            result.status = false
-          end
+          task.validate(output, logger)
         rescue => exc
           logger.warn("Failed #{task.description}")
           result.status = false

spec/octocatalog-diff/tests/util/catalogs_spec.rb

@@ -198,7 +198,7 @@ def valid?
         logger, _logger_string = OctocatalogDiff::Spec.setup_logger
         testobj = OctocatalogDiff::Util::Catalogs.new(options, logger)
         re = %r{ENC.*/asdkfjlfjkalksdfads wasn't found}
-        expect { testobj.catalogs }.to raise_error(OctocatalogDiff::Errors::CatalogError, re)
+        expect { testobj.catalogs }.to raise_error(Errno::ENOENT, re)
       end
     end
   end
@@ -211,7 +211,7 @@ def valid?
         logger, _logger_string = OctocatalogDiff::Spec.setup_logger
         testobj = OctocatalogDiff::Util::Catalogs.new(options, logger)
         re = %r{hiera.yaml.*/asdkfjlfjkalksdfads\) wasn't found}
-        expect { testobj.catalogs }.to raise_error(OctocatalogDiff::Errors::CatalogError, re)
+        expect { testobj.catalogs }.to raise_error(Errno::ENOENT, re)
       end
     end
   end