Skip to content

Commit 54cb851

Browse files
authored
Merge pull request #514 from puppetlabs/test_fix
(MAINT) Update tests to account for background changes
2 parents b0e6e8f + a0d7b20 commit 54cb851

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

spec/classes/motd_spec.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@
4646
ensure: 'file', backup: 'false',
4747
# The following Regex checks for the matching content in this comment and allows for two different IP values to be matched after foo.example.com. This is a workaround to ensure that PDK
4848
# integration testing passes while the MOTD unit tests dont break. The string we are looking for is:
49-
# "RedHat 9.3 x86_64\n\nFQDN: foo.example.com (172.16.254.254 OR 10.109.1.2)\nProcessor: Intel(R) Xeon(R) CPU E5-2667 v3 @ 3.20GHz\nKernel: Linux\nMemory Size: 1.44 GiB\n",
50-
content: %r{RedHat\s9\.3\sx86_64\n\nFQDN:\s*foo\.example\.com\s\((172\.16\.254\.254|10\.109\.1\.2)\)\nProcessor:\s*Intel\(R\)\sXeon\(R\).*\nKernel:\s*Linux\nMemory\sSize:\s*\d+\.\d+\sGiB},
49+
# "RedHat 9.3 x86_64\n\nFQDN: foo.example.com (172.16.254.254 OR 10.109.1.2)\n
50+
# Processor: (Intel(R) Xeon(R) CPU E5-2667 v3 @ 3.20GHz OR AMD Ryzen 7 PRO 4750U with Radeon Graphic)s\nKernel: Linux\nMemory Size: 1.44 GiB\n",
51+
content: %r{RedHat\s9\.3\sx86_64\n\nFQDN:\s*foo\.example\.com\s\(\d*\.\d*\.\d*\.\d*\)\nProcessor:\s*(Intel\(R\)\sXeon\(R\)|AMD\sRyzen).*\nKernel:\s*Linux\nMemory\sSize:\s*\d+\.\d+\sGiB},
5152
owner: 'root', group: 'root', mode: '0644'
5253
)
5354
end
@@ -206,7 +207,7 @@
206207
# The following Regex checks for the matching content in this comment and allows for two different IP values to be matched after foo.example.com. This is a workaround to ensure that PDK
207208
# integration testing passes while the MOTD unit tests dont break. The string we are looking for is:
208209
# "windows 10 x64\n\nFQDN: foo.example.com (172.16.254.254)\nProcessor: Intel(R) Xeon(R) Platinum 8272CL CPU @ 2.60GHz\nKernel: windows\nMemory Size: 14.34 GiB\n",
209-
data: %r{windows\s10\sx64\n\nFQDN:\s*foo.example.com\s\((172\.16\.254\.254|10\.138\.1\.5)\)\nProcessor:\s*Intel\(R\)\sXeon\(R\).*\nKernel:\s*windows\nMemory\sSize:\s*\d+\.\d+\sGiB},
210+
data: %r{windows\s10\sx64\n\nFQDN:\s*foo.example.com\s\(\d*\.\d*\.\d*\.\d*\)\nProcessor:\s*Intel\(R\)\sXeon\(R\).*\nKernel:\s*windows\nMemory\sSize:\s*\d+\.\d+\sGiB},
210211
)
211212
end
212213
end

0 commit comments

Comments
 (0)