X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=bindings%2Fperl%2Ft%2F01_methods.t;h=4a4822aeff4b15192fe0e53254428b775831fbe3;hb=3e0dd5070e385b864c771902bfa4c6331c5710b4;hp=2f7818b15799cb650e6d2288072286f4426ac583;hpb=25b5f5c49dd50c64f41b7bf69b8e471b0ffc6f15;p=collectd.git

diff --git a/bindings/perl/t/01_methods.t b/bindings/perl/t/01_methods.t
index 2f7818b1..4a4822ae 100644
--- a/bindings/perl/t/01_methods.t
+++ b/bindings/perl/t/01_methods.t
@@ -9,14 +9,12 @@ use Collectd::MockDaemon;
 my $path = mockd_start();
 END { mockd_stop(); }
 
-sub filter_time { return map { delete $_->{time}; $_ } @_ }
-
 sub test_query {
     my ($s, $attr, $results) = @_;
     my ($nresults, $resultdata) = @$results;
     my $r = $s->getval(%{Collectd::Unixsock::_parse_identifier($attr)});
     is(ref $r, 'HASH', "Got a result for $attr");
-    is(scalar keys $r, $nresults, "$nresults result result for $attr");
+    is(scalar keys %$r, $nresults, "$nresults result result for $attr");
     is_deeply($r, $resultdata, "Data or $attr matches");
 }
 
@@ -33,24 +31,24 @@ test_query($s, $_, $queries{$_}) for sort keys %queries;
 
 my @values = $s->listval;
 is(scalar @values, 4984, "Correct number of results from LISTVAL");
-delete $values[1234]{time};     # won't be constant
 is_deeply($values[1234], {
         type_instance => 'nice',
         plugin_instance => 21,
         plugin => 'cpu',
         type => 'cpu',
-        host => 'h2gdf6120'
+        host => 'h2gdf6120',
+        time => 1479835354.434,
     }, "Correct data returned for select element");
 @values = ();
 
-is_deeply([ filter_time $s->listval_filter() ] , [ filter_time $s->listval ], "listval_filter() w/o filter equivalent to listval()");
+is_deeply([ $s->listval_filter() ] , [ $s->listval ], "listval_filter() w/o filter equivalent to listval()");
 is_deeply(
-    [ filter_time $s->listval_filter(host => 'a1d8f6310', plugin => 'disk', plugin_instance => 'vda6') ],
+    [ $s->listval_filter(host => 'a1d8f6310', plugin => 'disk', plugin_instance => 'vda6') ],
     [
-        { 'plugin_instance' => 'vda6', 'type' => 'disk_merged', 'plugin' => 'disk', 'host' => 'a1d8f6310' },
-        { 'host' => 'a1d8f6310', 'plugin' => 'disk', 'plugin_instance' => 'vda6', 'type' => 'disk_octets' },
-        { 'type' => 'disk_ops', 'plugin_instance' => 'vda6', 'plugin' => 'disk', 'host' => 'a1d8f6310' },
-        { 'plugin' => 'disk', 'host' => 'a1d8f6310', 'type' => 'disk_time', 'plugin_instance' => 'vda6' }
+        { 'plugin_instance' => 'vda6', 'type' => 'disk_merged', 'plugin' => 'disk', 'host' => 'a1d8f6310', time => 1479835354.434 },
+        { 'host' => 'a1d8f6310', 'plugin' => 'disk', 'plugin_instance' => 'vda6', 'type' => 'disk_octets', time => 1479835356 },
+        { 'type' => 'disk_ops', 'plugin_instance' => 'vda6', 'plugin' => 'disk', 'host' => 'a1d8f6310', time => 1479835354 },
+        { 'plugin' => 'disk', 'host' => 'a1d8f6310', 'type' => 'disk_time', 'plugin_instance' => 'vda6', time => 1479835354 }
     ],
     "Correct result from listval_filter on <host>, <plugin> and <plugin_instance>"
 );