Skip to content

Commit 431288b

Browse files
committed
(FM-7345) - Update to test output to account for windows changes
1 parent 1ff0a52 commit 431288b

File tree

1 file changed

+17
-6
lines changed

1 file changed

+17
-6
lines changed

Diff for: spec/acceptance/pkcs12_spec.rb

+17-6
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,23 @@
6161

6262
apply_manifest(pp, catch_failures: true)
6363

64-
expectations = [
65-
%r{Alias name: leaf cert},
66-
%r{Entry type: (keyEntry|PrivateKeyEntry)},
67-
%r{Certificate chain length: 2},
68-
%r{^Serial number: 5$.*^Serial number: 6$}m,
69-
]
64+
expectations = if fact('osfamily') == 'windows'
65+
[
66+
%r{Alias name: leaf cert},
67+
%r{Entry type: (keyEntry|PrivateKeyEntry)},
68+
%r{Certificate chain length: 3},
69+
%r{^Serial number: 3$}m,
70+
%r{^Serial number: 4$}m,
71+
%r{^Serial number: 5$}m,
72+
]
73+
else
74+
[
75+
%r{Alias name: leaf cert},
76+
%r{Entry type: (keyEntry|PrivateKeyEntry)},
77+
%r{Certificate chain length: 2},
78+
%r{^Serial number: 5$.*^Serial number: 6$}m,
79+
]
80+
end
7081
shell("\"#{@keytool_path}keytool\" -list -v -keystore #{target} -storepass puppet") do |r|
7182
expect(r.exit_code).to be_zero
7283
end

0 commit comments

Comments
 (0)