diff --git a/lib/knapsack/distributors/base_distributor.rb b/lib/knapsack/distributors/base_distributor.rb index 9440245..5ec3563 100644 --- a/lib/knapsack/distributors/base_distributor.rb +++ b/lib/knapsack/distributors/base_distributor.rb @@ -45,12 +45,17 @@ def all_tests # support specifying a list_file to use similar to KnapsackPro # ref: KnapsackPro/knapsack_pro-ruby/commit/7d7b8db8be524f2f30d7d80d3a6444dad9f85b1b def test_files - return Dir.glob(test_file_pattern).uniq.sort if test_file_list_source_file.nil? + default = Dir.glob(test_file_pattern).uniq.sort - File.read(test_file_list_source_file) + return default if test_file_list_source_file.nil? + + test_file_list = File.read(test_file_list_source_file) .split(/\n/) .uniq .sort + + return default if test_file_list.empty? + return test_file_list end protected diff --git a/lib/knapsack/runners/rspec_runner.rb b/lib/knapsack/runners/rspec_runner.rb index bff1635..eb1d2b7 100644 --- a/lib/knapsack/runners/rspec_runner.rb +++ b/lib/knapsack/runners/rspec_runner.rb @@ -5,12 +5,19 @@ def self.run(args) allocator = Knapsack::AllocatorBuilder.new(Knapsack::Adapters::RSpecAdapter).allocator Knapsack.logger.info + puts '' Knapsack.logger.info 'Report specs:' + puts 'Report specs:' Knapsack.logger.info allocator.report_node_tests + puts allocator.report_node_tests Knapsack.logger.info + puts '' Knapsack.logger.info 'Leftover specs:' + puts 'Leftover specs:' Knapsack.logger.info allocator.leftover_node_tests + puts allocator.leftover_node_tests Knapsack.logger.info + puts # NOTE: return if there are no specs to execute for this node. # This can occurr if test_file_list_source_file is used with less then CI_NODES specs