Skip to content

Commit ace2f29

Browse files
authored
Merge pull request #1388 from puppetlabs/CAT-2026
(CAT-2026) Update how `pdk test unit --list` detects an error
2 parents 9041f64 + e1c7350 commit ace2f29

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

lib/pdk/tests/unit.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,10 @@ def self.list(options = {})
246246
raise PDK::CLI::FatalError, format('Failed to find valid JSON in output from rspec: %{output}', output: output[:stdout]) unless rspec_json
247247

248248
if rspec_json['examples'].empty?
249-
rspec_message = rspec_json['messages'][0]
250-
return [] if rspec_message == 'No examples found.'
249+
return [] if rspec_json['messages'][0] == 'No examples found.'
250+
return [] if rspec_json['messages'].include?("\nAll examples were filtered out")
251251

252-
raise PDK::CLI::FatalError, format('Unable to enumerate examples. rspec reported: %{message}', message: rspec_message)
252+
raise PDK::CLI::FatalError, format('Unable to enumerate examples. rspec reported: %{message}', message: rspec_json['messages'])
253253
else
254254
examples = []
255255
rspec_json['examples'].each do |example|

spec/acceptance/test_unit_spec.rb

+3-5
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,9 @@
4747
require 'spec_helper'
4848
4949
RSpec.describe 'passing test' do
50-
on_supported_os(:facterversion => '2.4.6').each do |os, facts|
51-
context "On OS \#{os}" do
52-
it 'should pass' do
53-
expect(true).to eq(true)
54-
end
50+
context 'On OS' do
51+
it 'should pass' do
52+
expect(true).to eq(true)
5553
end
5654
end
5755
end

0 commit comments

Comments
 (0)