Skip to content

Commit ef481dd

Browse files
g-bougardg-bougard
committed
test: Fix cpu name related tests
1 parent 4e78266 commit ef481dd

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

‎t/agent/tools/generic.t‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7129,7 +7129,7 @@ my %cpu_tests = (
71297129
'freebsd-8.1' => [
71307130
{
71317131
ID => 'BFEBFBFF00020652',
7132-
NAME => 'Intel Core i5 CPU M 430 @ 2.27GHz',
7132+
NAME => 'Intel(R) Core(TM) i5 CPU M 430 @ 2.27GHz',
71337133
EXTERNAL_CLOCK => '1066',
71347134
SPEED => '2270',
71357135
THREAD => '2',
@@ -7145,7 +7145,7 @@ my %cpu_tests = (
71457145
'hp-dl180' => [
71467146
{
71477147
ID => 'BFEBFBFF000106A5',
7148-
NAME => 'Intel Xeon CPU E5504 @ 2.00GHz',
7148+
NAME => 'Intel(R) Xeon(R) CPU E5504 @ 2.00GHz',
71497149
EXTERNAL_CLOCK => '532',
71507150
SPEED => '2000',
71517151
THREAD => '1',
@@ -7171,7 +7171,7 @@ my %cpu_tests = (
71717171
'rhel-3.4' => [
71727172
{
71737173
ID => 'BFEBFBFF00000F41',
7174-
NAME => 'Intel Xeon CPU 2.80GHz',
7174+
NAME => 'Intel(R) Xeon(TM) CPU 2.80GHz',
71757175
EXTERNAL_CLOCK => '200',
71767176
SPEED => '2800',
71777177
SERIAL => undef,
@@ -7184,7 +7184,7 @@ my %cpu_tests = (
71847184
},
71857185
{
71867186
ID => 'BFEBFBFF00000F41',
7187-
NAME => 'Intel Xeon CPU 2.80GHz',
7187+
NAME => 'Intel(R) Xeon(TM) CPU 2.80GHz',
71887188
EXTERNAL_CLOCK => '200',
71897189
SPEED => '2800',
71907190
SERIAL => undef,
@@ -7201,7 +7201,7 @@ my %cpu_tests = (
72017201
'rhel-4.3' => [
72027202
{
72037203
ID => 'BFEBFBFF00000F29',
7204-
NAME => 'Intel Xeon',
7204+
NAME => 'Intel Xeon(tm)',
72057205
EXTERNAL_CLOCK => '133',
72067206
SPEED => '2666',
72077207
SERIAL => undef,
@@ -7214,7 +7214,7 @@ my %cpu_tests = (
72147214
},
72157215
{
72167216
ID => 'BFEBFBFF00000F29',
7217-
NAME => 'Intel Xeon',
7217+
NAME => 'Intel Xeon(tm)',
72187218
EXTERNAL_CLOCK => '133',
72197219
SPEED => '2666',
72207220
SERIAL => undef,
@@ -7244,7 +7244,7 @@ my %cpu_tests = (
72447244
'rhel-5.6' => [
72457245
{
72467246
ID => 'BFEBFBFF000206C2',
7247-
NAME => 'Intel Xeon CPU E5620 @ 2.40GHz',
7247+
NAME => 'Intel(R) Xeon(R) CPU E5620 @ 2.40GHz',
72487248
EXTERNAL_CLOCK => '5860',
72497249
SPEED => '2400',
72507250
THREAD => '2',
@@ -7258,7 +7258,7 @@ my %cpu_tests = (
72587258
},
72597259
{
72607260
ID => 'BFEBFBFF000206C2',
7261-
NAME => 'Intel Xeon CPU E5620 @ 2.40GHz',
7261+
NAME => 'Intel(R) Xeon(R) CPU E5620 @ 2.40GHz',
72627262
EXTERNAL_CLOCK => '5860',
72637263
SPEED => '2400',
72647264
THREAD => '2',
@@ -7274,7 +7274,7 @@ my %cpu_tests = (
72747274
'rhel-6.3-esx-1vcpu' => [
72757275
{
72767276
ID => '0FABFBFF000206A7',
7277-
NAME => 'Intel Core i5-2500S CPU @ 2.70GHz',
7277+
NAME => 'Intel(R) Core(TM) i5-2500S CPU @ 2.70GHz',
72787278
SPEED => '2700',
72797279
SERIAL => undef,
72807280
MANUFACTURER => 'GenuineIntel',
@@ -7339,7 +7339,7 @@ my %cpu_tests = (
73397339
MODEL => 63,
73407340
MANUFACTURER => 'Intel',
73417341
ID => 'BFEBFBFF000306F2',
7342-
NAME => 'Intel Xeon CPU E5-2699 v3 @ 2.30GHz',
7342+
NAME => 'Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz',
73437343
FAMILYNUMBER => 6,
73447344
STEPPING => 2,
73457345
SERIAL => undef,
@@ -7351,7 +7351,7 @@ my %cpu_tests = (
73517351
ID => 'BFEBFBFF000306F2',
73527352
STEPPING => 2,
73537353
FAMILYNUMBER => 6,
7354-
NAME => 'Intel Xeon CPU E5-2699 v3 @ 2.30GHz',
7354+
NAME => 'Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz',
73557355
SERIAL => undef,
73567356
FAMILYNAME => 'Xeon',
73577357
THREAD => '2',
@@ -7363,7 +7363,7 @@ my %cpu_tests = (
73637363
'S3000AHLX' => [
73647364
{
73657365
ID => 'BFEBFBFF000006F6',
7366-
NAME => 'Intel Core2 CPU 6600 @ 2.40GHz',
7366+
NAME => 'Intel(R) Core(TM)2 CPU 6600 @ 2.40GHz',
73677367
EXTERNAL_CLOCK => '266',
73687368
SPEED => '2400',
73697369
SERIAL => undef,
@@ -7378,7 +7378,7 @@ my %cpu_tests = (
73787378
'S5000VSA' => [
73797379
{
73807380
ID => 'BFEBFBFF000006F6',
7381-
NAME => 'Intel Xeon CPU 5120 @ 1.86GHz',
7381+
NAME => 'Intel(R) Xeon(R) CPU 5120 @ 1.86GHz',
73827382
EXTERNAL_CLOCK => '1066',
73837383
SPEED => '1860',
73847384
THREAD => '1',
@@ -7392,7 +7392,7 @@ my %cpu_tests = (
73927392
},
73937393
{
73947394
ID => 'BFEBFBFF000006F6',
7395-
NAME => 'Intel Xeon CPU 5120 @ 1.86GHz',
7395+
NAME => 'Intel(R) Xeon(R) CPU 5120 @ 1.86GHz',
73967396
EXTERNAL_CLOCK => '1066',
73977397
SPEED => '1860',
73987398
THREAD => '1',
@@ -7408,7 +7408,7 @@ my %cpu_tests = (
74087408
'linux-1' => [
74097409
{
74107410
ID => 'BFEBFBFF0001067A',
7411-
NAME => 'Intel Core2 Duo CPU E8400 @ 3.00GHz',
7411+
NAME => 'Intel(R) Core(TM)2 Duo CPU E8400 @ 3.00GHz',
74127412
EXTERNAL_CLOCK => '333',
74137413
SPEED => '3000',
74147414
THREAD => '1',
@@ -7536,7 +7536,7 @@ my %cpu_tests = (
75367536
'windows-7' => [
75377537
{
75387538
ID => 'BFEBFBFF000206A7',
7539-
NAME => 'Intel Core i5-2300 CPU @ 2.80GHz',
7539+
NAME => 'Intel(R) Core(TM) i5-2300 CPU @ 2.80GHz',
75407540
EXTERNAL_CLOCK => '100',
75417541
SPEED => '2800',
75427542
SERIAL => undef,
@@ -7552,7 +7552,7 @@ my %cpu_tests = (
75527552
'windows-7.2' => [
75537553
{
75547554
ID => '178BFBFF00100F62',
7555-
NAME => 'AMD Athlon II X2 245 Processor',
7555+
NAME => 'AMD Athlon(tm) II X2 245 Processor',
75567556
EXTERNAL_CLOCK => '200',
75577557
SPEED => '2900',
75587558
SERIAL => undef,
@@ -7573,7 +7573,7 @@ my %cpu_tests = (
75737573
ID => 'BFEBFBFF000206A7',
75747574
MANUFACTURER => 'Intel(R) Corporation',
75757575
MODEL => '42',
7576-
NAME => 'Intel Core i5-2450M CPU @ 2.50GHz',
7576+
NAME => 'Intel(R) Core(TM) i5-2450M CPU @ 2.50GHz',
75777577
SERIAL => 'Not Supported by CPU',
75787578
SPEED => '2500',
75797579
STEPPING => '7',

‎t/tasks/inventory/windows/cpu.t‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ my %tests = (
3333
'7' => [
3434
{
3535
ID => 'BFEBFBFF000206A7',
36-
NAME => 'Intel Core i5-2300 CPU @ 2.80GHz',
36+
NAME => 'Intel(R) Core(TM) i5-2300 CPU @ 2.80GHz',
3737
SERIAL => undef,
3838
MANUFACTURER => 'Intel',
3939
DESCRIPTION => 'x86 Family 6 Model 42 Stepping 7',
@@ -148,7 +148,7 @@ my %tests = (
148148
'2008-with-2-different-cpus' => [
149149
{
150150
ID => 'BFEBFBFF000106A5',
151-
NAME => 'Intel Xeon CPU E5504 @ 2.00GHz',
151+
NAME => 'Intel(R) Xeon(R) CPU E5504 @ 2.00GHz',
152152
SERIAL => undef,
153153
MANUFACTURER => 'Intel',
154154
DESCRIPTION => 'Intel64 Family 6 Model 26 Stepping 5',
@@ -161,7 +161,7 @@ my %tests = (
161161
},
162162
{
163163
ID => 'BFEBFBFF000106A5',
164-
NAME => 'Intel Xeon CPU E5506 @ 2.13GHz',
164+
NAME => 'Intel(R) Xeon(R) CPU E5506 @ 2.13GHz',
165165
SERIAL => undef,
166166
MANUFACTURER => 'Intel',
167167
DESCRIPTION => 'Intel64 Family 6 Model 26 Stepping 5',

0 commit comments

Comments
 (0)