Skip to content

Commit d336252

Browse files
committed
(CAT-1805) Update tests to account for PDK integration
This module is currently used in oder to test the pdk, with commands being run against it. As part of this however the values returned by the tests I have updated here can vary between the PDK integration test suite on Jenkins and the MOTD test suite on Github Actions. This change aims to resolve this by generalizing the expected values that can very between them.
1 parent 9cddfc7 commit d336252

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

spec/classes/motd_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
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:
4949
# "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\)\s*.*\nKernel:\s*Linux\nMemory\sSize:\s*1.44\sGiB},
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},
5151
owner: 'root', group: 'root', mode: '0644'
5252
)
5353
end
@@ -206,7 +206,7 @@
206206
# 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
207207
# integration testing passes while the MOTD unit tests dont break. The string we are looking for is:
208208
# "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\)\sPlatinum\s8272CL\sCPU\s@\s2\.60GHz\nKernel:\s*windows\nMemory\sSize:\s*14\.34\sGiB}, # rubocop:disable Layout/LineLength
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},
210210
)
211211
end
212212
end

0 commit comments

Comments
 (0)