diff --git a/t/inventory/solaris/networks.t b/t/inventory/solaris/networks.t index 8c0e1b022b..057c41fe75 100755 --- a/t/inventory/solaris/networks.t +++ b/t/inventory/solaris/networks.t @@ -74,40 +74,40 @@ my %ifconfig_tests = ( ], 'opensolaris' => [ { - 'IPSUBNET' => '127.0.0.0', - 'IPMASK' => '255.0.0.0', - 'DESCRIPTION' => 'lo0', - 'STATUS' => 'Up', - 'SPEED' => undef, - 'IPADDRESS' => '127.0.0.1' + IPSUBNET => '127.0.0.0', + IPMASK => '255.0.0.0', + DESCRIPTION => 'lo0', + STATUS => 'Up', + SPEED => undef, + IPADDRESS => '127.0.0.1' }, { - 'IPMASK' => '255.255.255.0', - 'MACADDR' => '08:00:27:fc:ad:56', - 'STATUS' => 'Up', - 'SPEED' => undef, - 'IPSUBNET' => '192.168.0.0', - 'DESCRIPTION' => 'e1000g0', - 'IPADDRESS' => '192.168.0.41' + IPMASK => '255.255.255.0', + MACADDR => '08:00:27:fc:ad:56', + STATUS => 'Up', + SPEED => undef, + IPSUBNET => '192.168.0.0', + DESCRIPTION => 'e1000g0', + IPADDRESS => '192.168.0.41' }, { - 'IPSUBNET' => undef, - 'DESCRIPTION' => 'lo0', - 'STATUS' => 'Up', - 'SPEED' => undef + IPSUBNET => undef, + DESCRIPTION => 'lo0', + STATUS => 'Up', + SPEED => undef }, { - 'IPSUBNET' => undef, - 'MACADDR' => '08:00:27:fc:ad:56', - 'DESCRIPTION' => 'e1000g0', - 'STATUS' => 'Up', - 'SPEED' => undef + IPSUBNET => undef, + MACADDR => '08:00:27:fc:ad:56', + DESCRIPTION => 'e1000g0', + STATUS => 'Up', + SPEED => undef }, { - 'IPSUBNET' => undef, - 'DESCRIPTION' => 'e1000g0:1', - 'STATUS' => 'Up', - 'SPEED' => undef + IPSUBNET => undef, + DESCRIPTION => 'e1000g0:1', + STATUS => 'Up', + SPEED => undef } ] @@ -124,26 +124,26 @@ foreach my $test (keys %ifconfig_tests) { my @parsefcinfo = ( { - 'FIRMWARE' => '05.03.02', - 'STATUS' => 'Up', - 'SPEED' => '4Gb', - 'TYPE' => 'HBA', - 'DRIVER' => 'qlc', - 'DESCRIPTION' => 'HBA_Port_WWN_1 /dev/cfg/c0', - 'MANUFACTURER' => 'QLogic Corp.', - 'MODEL' => 'QLE2462', - 'WWN' => '200000e08b94b4a3' + FIRMWARE => '05.03.02', + STATUS => 'Up', + SPEED => '4Gb', + TYPE => 'HBA', + DRIVER => 'qlc', + DESCRIPTION => 'HBA_Port_WWN_1 /dev/cfg/c0', + MANUFACTURER => 'QLogic Corp.', + MODEL => 'QLE2462', + WWN => '200000e08b94b4a3' }, { - 'FIRMWARE' => '05.03.02', - 'STATUS' => 'Up', - 'SPEED' => '4Gb', - 'TYPE' => 'HBA', - 'DRIVER' => 'qlc', - 'DESCRIPTION' => 'HBA_Port_WWN_2 /dev/cfg/c1', - 'MANUFACTURER' => 'QLogic Corp.', - 'MODEL' => 'QLE2462', - 'WWN' => '200100e08bb4b4a3' + FIRMWARE => '05.03.02', + STATUS => 'Up', + SPEED => '4Gb', + TYPE => 'HBA', + DRIVER => 'qlc', + DESCRIPTION => 'HBA_Port_WWN_2 /dev/cfg/c1', + MANUFACTURER => 'QLogic Corp.', + MODEL => 'QLE2462', + WWN => '200100e08bb4b4a3' } ); my $file = "resources/solaris/fcinfo_hba-port/sample-1"; diff --git a/t/inventory/windows/registry.t b/t/inventory/windows/registry.t index 5ec859e93e..f2f4027419 100644 --- a/t/inventory/windows/registry.t +++ b/t/inventory/windows/registry.t @@ -25,18 +25,16 @@ if ($OSNAME ne 'MSWin32') { plan tests => 8; } - - my @data; @data = FusionInventory::Agent::Task::Inventory::Input::Win32::Registry::_getRegistryData( registry => { - 'NAME' => 'REGISTRY', - 'PARAM' => { - 'NAME' => 'CurrentVersion', - 'content' => 'ProductId', - 'REGTREE' => '2', - 'REGKEY' => 'SOFTWARE\\Microsoft\\Windows\\CurrentVersion' + NAME => 'REGISTRY', + PARAM => { + NAME => 'CurrentVersion', + content => 'ProductId', + REGTREE => '2', + REGKEY => 'SOFTWARE\\Microsoft\\Windows\\CurrentVersion' } } ); @@ -46,19 +44,19 @@ ok($data[0]->{entry}{NAME} eq 'CurrentVersion', "unique entry: NAME"); @data = FusionInventory::Agent::Task::Inventory::Input::Win32::Registry::_getRegistryData( registry => { - 'NAME' => 'REGISTRY', - 'PARAM' => [ + NAME => 'REGISTRY', + PARAM => [ { - 'NAME' => 'ProductID', - 'content' => 'ProductId', - 'REGTREE' => '2', - 'REGKEY' => 'SOFTWARE\\Microsoft\\Windows\\CurrentVersion' + NAME => 'ProductID', + content => 'ProductId', + REGTREE => '2', + REGKEY => 'SOFTWARE\\Microsoft\\Windows\\CurrentVersion' }, { - 'NAME' => 'CurrentVersion', - 'content' => '*', - 'REGTREE' => '2', - 'REGKEY' => 'SOFTWARE\\Microsoft\\Windows\\CurrentVersion' + NAME => 'CurrentVersion', + content => '*', + REGTREE => '2', + REGKEY => 'SOFTWARE\\Microsoft\\Windows\\CurrentVersion' } ] } @@ -69,4 +67,3 @@ ok($data[0]->{entry}{REGVALUE}, "Wildcare test: REGVALUE"); ok($data[0]->{entry}{NAME} eq 'ProductID', "Wildcare test NAME (1/3)"); ok($data[1]->{entry}{NAME} eq 'CurrentVersion', "Wildcare test NAME (2/3)"); ok($data[2]->{entry}{NAME} eq 'CurrentVersion', "Wildcare test NAME (3/3)"); - diff --git a/t/tools/win32.t b/t/tools/win32.t index bc800e2b53..01c0e2cd34 100644 --- a/t/tools/win32.t +++ b/t/tools/win32.t @@ -4,7 +4,6 @@ use strict; use warnings; use English qw(-no_match_vars); - use Test::More; BEGIN {