Skip to content

Commit 7c692c0

Browse files
committed
(maint) fix broken matrix v2 tests
1 parent fa7efa5 commit 7c692c0

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

spec/exe/matrix_from_metadata_v2_spec.rb

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
end
1818

1919
it 'generates the matrix' do # rubocop:disable RSpec/ExampleLength
20+
expect(result.stdout).to include('::warning::Cannot find image for CentOS-6')
2021
expect(result.stdout).to include('::warning::Cannot find image for Ubuntu-14.04')
2122
expect(github_output_content).to include(
2223
[
2324
'matrix={',
2425
'"platforms":[',
25-
'{"label":"CentOS-6","provider":"docker","image":"litmusimage/centos:6"},',
2626
'{"label":"RedHat-8","provider":"provision_service","image":"rhel-8"},',
2727
'{"label":"RedHat-9","provider":"provision_service","image":"rhel-9"},',
2828
'{"label":"RedHat-9-arm","provider":"provision_service","image":"rhel-9-arm64"},',
@@ -39,7 +39,7 @@
3939
expect(github_output_content).to include(
4040
'spec_matrix={"include":[{"puppet_version":"~> 7.24","ruby_version":2.7},{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
4141
)
42-
expect(result.stdout).to include("Created matrix with 16 cells:\n - Acceptance Test Cells: 14\n - Spec Test Cells: 2")
42+
expect(result.stdout).to include("Created matrix with 14 cells:\n - Acceptance Test Cells: 12\n - Spec Test Cells: 2")
4343
end
4444
end
4545

@@ -57,13 +57,13 @@
5757
end
5858

5959
it 'generates the matrix without excluded platforms' do # rubocop:disable RSpec/ExampleLength
60+
expect(result.stdout).to include('::warning::Cannot find image for CentOS-6')
6061
expect(result.stdout).to include('::warning::Cannot find image for Ubuntu-14.04')
6162
expect(result.stdout).to include('::warning::Ubuntu-18.04 was excluded from testing')
6263
expect(github_output_content).to include(
6364
[
6465
'matrix={',
6566
'"platforms":[',
66-
'{"label":"CentOS-6","provider":"docker","image":"litmusimage/centos:6"},',
6767
'{"label":"RedHat-8","provider":"provision_service","image":"rhel-8"},',
6868
'{"label":"RedHat-9","provider":"provision_service","image":"rhel-9"},',
6969
'{"label":"RedHat-9-arm","provider":"provision_service","image":"rhel-9-arm64"},',
@@ -79,7 +79,7 @@
7979
expect(github_output_content).to include(
8080
'spec_matrix={"include":[{"puppet_version":"~> 7.24","ruby_version":2.7},{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
8181
)
82-
expect(result.stdout).to include("Created matrix with 14 cells:\n - Acceptance Test Cells: 12\n - Spec Test Cells: 2")
82+
expect(result.stdout).to include("Created matrix with 12 cells:\n - Acceptance Test Cells: 10\n - Spec Test Cells: 2")
8383
end
8484
end
8585

@@ -98,14 +98,14 @@
9898

9999
it 'generates the matrix without excluded platforms' do
100100
expect(result.stdout).to include('::warning::Cannot find image for Ubuntu-14.04')
101+
expect(result.stdout).to include('::warning::Cannot find image for CentOS-6')
101102
expect(result.stdout).to include('::warning::Ubuntu-18.04 was excluded from testing')
102103
expect(result.stdout).to include('::warning::Ubuntu-22.04 was excluded from testing')
103104
expect(result.stdout).to include('::warning::RedHat-8 was excluded from testing')
104105
expect(github_output_content).to include(
105106
[
106107
'matrix={',
107108
'"platforms":[',
108-
'{"label":"CentOS-6","provider":"docker","image":"litmusimage/centos:6"},',
109109
'{"label":"RedHat-9-arm","provider":"provision_service","image":"rhel-9-arm64"},',
110110
'{"label":"Ubuntu-22.04-arm","provider":"provision_service","image":"ubuntu-2204-lts-arm64"}',
111111
'],',
@@ -118,7 +118,7 @@
118118
expect(github_output_content).to include(
119119
'spec_matrix={"include":[{"puppet_version":"~> 7.24","ruby_version":2.7},{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
120120
)
121-
expect(result.stdout).to include("Created matrix with 8 cells:\n - Acceptance Test Cells: 6\n - Spec Test Cells: 2")
121+
expect(result.stdout).to include("Created matrix with 6 cells:\n - Acceptance Test Cells: 4\n - Spec Test Cells: 2")
122122
end
123123
end
124124
end

0 commit comments

Comments
 (0)