Changeset 3836

Show
Ignore:
Timestamp:
07/27/10 19:39:01 (2 years ago)
Author:
ligne
Message:

_cat_file() is no longer needed.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/node/lib/Munin/Node/SpoolReader.pm

    r3835 r3836  
    103103 
    104104 
    105 sub _cat_file 
    106 { 
    107     my ($filename) = @_; 
    108  
    109     my $fh = IO::File->new($filename, '<') or return; 
    110  
    111         my $return_str = ''; 
    112         while (my $line = <$fh>) { 
    113                 chomp($line); 
    114                 # Remove any "." or empty line 
    115                 next if ($line eq '' || $line eq '.'); 
    116                 $return_str .= $line . "\n"; 
    117         } 
    118  
    119         return $return_str; 
    120 } 
    121  
    122  
    1231051; 
    124106 

  • trunk/node/t/munin_node_spoolreader.t

    r3833 r3836  
    33use strict; 
    44 
    5 use Test::More tests => 20; 
     5use Test::More tests => 18; 
    66use Test::LongString; 
    77 
    …… 
    240240} 
    241241 
    242  
    243 ### _cat_file 
    244 { 
    245     my $dir = tempdir(CLEANUP => 1); 
    246     my $reader = Munin::Node::SpoolReader->new(spooldir => $dir); 
    247  
    248     open my $blah, '>', "$dir/blah" or die "Unable to create blah file: $!"; 
    249     print $blah "rubbish\n.\n"; 
    250     close $blah; 
    251  
    252     is(Munin::Node::SpoolReader::_cat_file("$dir/blah"), "rubbish\n", 'Read contents of file'); 
    253  
    254     is(Munin::Node::SpoolReader::_cat_file("$dir/absent"), undef, 'Missing file just returns undef'); 
    255 } 
    256