Merge pull request #41 from g-bougard/2.3.x+minor-update-related-to-b…

…ugfix-2525 Changed test resource name to better match its purpose
fusioninventory · Jul 9, 2015 · 33bc5ad · 33bc5ad
2 parents 36365e0 + 2d0d7c9
commit 33bc5ad
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 13 deletions.
diff --git a/resources/generic/dmidecode/rhel-6.3 → ...rces/generic/dmidecode/rhel-6.3-esx-1vcpu b/resources/generic/dmidecode/rhel-6.3 → ...rces/generic/dmidecode/rhel-6.3-esx-1vcpu
diff --git a/resources/linux/proc/cpuinfo/rhel-6.3 → ...ces/linux/proc/cpuinfo/rhel-6.3-esx-1vcpu b/resources/linux/proc/cpuinfo/rhel-6.3 → ...ces/linux/proc/cpuinfo/rhel-6.3-esx-1vcpu
diff --git a/t/agent/tools/generic.t b/t/agent/tools/generic.t
@@ -6383,9 +6383,9 @@ my %cpu_tests = (
             THREAD         => '8',
             SERIAL         => undef,
             MANUFACTURER   => 'Intel',
-            STEPPING       => 2,
-            FAMILYNUMBER   => 6,
-            MODEL          => 44,
+            STEPPING       => '2',
+            FAMILYNUMBER   => '6',
+            MODEL          => '44',
             FAMILYNAME     => 'Xeon',
             CORE           => '4',
         },
@@ -6397,24 +6397,24 @@ my %cpu_tests = (
             THREAD         => '8',
             SERIAL         => undef,
             MANUFACTURER   => 'Intel',
-            STEPPING       => 2,
-            FAMILYNUMBER   => 6,
-            MODEL          => 44,
+            STEPPING       => '2',
+            FAMILYNUMBER   => '6',
+            MODEL          => '44',
             FAMILYNAME     => 'Xeon',
             CORE           => '4',
         }
     ],
-    'rhel-6.3' => [
+    'rhel-6.3-esx-1vcpu' => [
         {
             ID             => 'A7 06 02 00 FF FB AB 0F',
             NAME           => 'Intel(R) Core(TM) i5-2500S CPU @ 2.70GHz',
             SPEED          => '2700',
             THREAD         => undef,
             SERIAL         => undef,
             MANUFACTURER   => 'GenuineIntel',
-            STEPPING       => 7,
-            FAMILYNUMBER   => 6,
-            MODEL          => 42,
+            STEPPING       => '7',
+            FAMILYNUMBER   => '6',
+            MODEL          => '42',
             FAMILYNAME     => undef,
             CORE           => undef,
         }

diff --git a/t/agent/tools/linux.t b/t/agent/tools/linux.t
@@ -529,6 +529,27 @@ my %cpuinfo_tests = (
             'fpu_exception' => 'yes',
             'wp' => 'yes'
           }
+    ],
+    'rhel-6.3-esx-1vcpu' => [
+        {
+            'flags' => 'fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts mmx fxsr sse sse2 ss syscall nx rdtscp lm constant_tsc up arch_perfmon pebs bts xtopology tsc_reliable nonstop_tsc aperfmperf unfair_spinlock pni pclmulqdq ssse3 cx16 sse4_1 sse4_2 x2apic popcnt aes xsave avx hypervisor lahf_lm ida arat epb xsaveopt pln pts dts',
+            'stepping' => '7',
+            'wp' => 'yes',
+            'cpu family' => '6',
+            'cpu mhz' => '2694.293',
+            'model' => '42',
+            'fpu' => 'yes',
+            'vendor_id' => 'GenuineIntel',
+            'address sizes' => '40 bits physical, 48 bits virtual',
+            'cpuid level' => '13',
+            'fpu_exception' => 'yes',
+            'cache_alignment' => '64',
+            'cache size' => '6144 KB',
+            'model name' => 'Intel(R) Core(TM) i5-2500S CPU @ 2.70GHz',
+            'clflush size' => '64',
+            'bogomips' => '5388.58',
+            'processor' => '0'
+        }
     ]
 );
 

diff --git a/t/tasks/inventory/linux/cpu.t b/t/tasks/inventory/linux/cpu.t
@@ -61,15 +61,15 @@ my %i386 = (
             ID             => 'C2 06 02 00 FF FB EB BF',
         }
     ],
-    'rhel-6.3' => [
+    'rhel-6.3-esx-1vcpu' => [
         {
             NAME           => 'Intel(R) Core(TM) i5-2500S CPU @ 2.70GHz',
             MANUFACTURER   => 'Intel',
             MODEL          => '42',
             SPEED          => '2700',
-            THREAD         => 1,
+            THREAD         => '1',
             ARCH           => 'i386',
-            CORE           => 1,
+            CORE           => '1',
             STEPPING       => '7',
             FAMILYNUMBER   => '6',
             ID             => 'A7 06 02 00 FF FB AB 0F',