fix: Wrong bios value as array on win32 bios when using WMI in proxmox vm

test: Add related tests

Author: g-bougard

Diff for: Changes

@@ -18,6 +18,7 @@ inventory:
   'full-inventory-postpone' option to detect changes
 * Update glpi-agent script with --full-inventory-postpone option support
 * Update glpi-agent script with --full option support to force a full inventory
+* fix #611: Wrong bios value as array on win32 bios when using WMI in proxmox vm
 
 netdiscovery/netinventory:
 * Keep device mac address found via snmp during netdiscovery as this is the one

Diff for: lib/GLPI/Agent/Task/Inventory/Win32/Bios.pm

@@ -96,7 +96,7 @@ sub doInventory {
             $bios->{SSN} = $object->{SerialNumber}
                 unless $bios->{SSN};
         }
-        $bios->{MMODEL}          = $object->{Product};
+        $bios->{MMODEL} = $object->{Product};
         unless (empty($object->{Manufacturer})) {
             $bios->{MMANUFACTURER} = $object->{Manufacturer};
             $bios->{SMANUFACTURER} = $object->{Manufacturer}
@@ -105,6 +105,8 @@ sub doInventory {
     }
 
     foreach (keys %$bios) {
+        # Handle case we have an array of one string in place of the expected string
+        $bios->{$_} = shift @{$bios->{$_}} if ref($bios->{$_}) eq 'ARRAY';
         $bios->{$_} =~ s/\s+$// if $bios->{$_};
         delete $bios->{$_} if isInvalidBiosValue($bios->{$_});
     }

Diff for: resources/win32/wmi/proxmox-Win32_Bios.wmi

@@ -8,8 +8,11 @@ use lib 't/lib';
 use English qw(-no_match_vars);
 use Test::More;
 use Test::MockModule;
+use Test::Deep;
+use Test::Exception;
 use UNIVERSAL::require;
 
+use GLPI::Agent::Inventory;
 use GLPI::Test::Utils;
 
 BEGIN {
@@ -28,13 +31,50 @@ Test::NoWarnings->use();
 GLPI::Agent::Task::Inventory::Win32::Bios->require();
 
 my %tests = (
+    "proxmox"   => {
+        BDATE           => '04/01/2014',
+        BIOSSERIAL      => undef,
+        BVERSION        => 'BOCHS  - 1',
+        SSN             => undef,
+        SMODEL          => 'BXPC____',
+        SMANUFACTURER   => 'BOCHS_',
+        BMANUFACTURER   => undef,
+    },
+);
+
+my %date_tests = (
     "20050927******.******+***" => "09/27/2005",
     "foobar" => "foobar"
 );
-plan tests => (scalar keys %tests) + 1;
 
-foreach my $input (keys %tests) {
-    my $result = $tests{$input};
+plan tests => (scalar keys %tests) +
+              (scalar keys %date_tests) + 1;
+
+my $inventory = GLPI::Agent::Inventory->new();
+
+my $module = Test::MockModule->new(
+    'GLPI::Agent::Task::Inventory::Win32::Bios'
+);
+
+foreach my $test (keys %tests) {
+    $module->mock(
+        'getWMIObjects',
+        mockGetWMIObjects($test)
+    );
+
+    GLPI::Agent::Task::Inventory::Win32::Bios::doInventory(
+        inventory   => $inventory
+    );
+    my $bios = $inventory->getSection('BIOS');
+   cmp_deeply(
+        $bios,
+        $tests{$test},
+        "$test: BIOS parsing"
+    );
+}
+
+foreach my $input (keys %date_tests) {
+    my $result = $date_tests{$input};
 
     ok(GLPI::Agent::Task::Inventory::Win32::Bios::_dateFromIntString($input) eq $result, "_dateFromIntString($input)");
 }