From bc8ff11acccb5cd555dc2372fafc4f9d594c3b25 Mon Sep 17 00:00:00 2001 From: Romain d'Alverny Date: Fri, 17 Feb 2012 18:45:59 +0000 Subject: fix typos, remove unneeded tests here --- image_tests/000_test_env.t | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/image_tests/000_test_env.t b/image_tests/000_test_env.t index eea336c..4ffff95 100644 --- a/image_tests/000_test_env.t +++ b/image_tests/000_test_env.t @@ -27,8 +27,10 @@ bail_on_fail; my ($image_path) = @ARGV; +diag("Testing test environment."); + # FIXME root is needed for mount/umount of the ISO. Find another way. -is($ENV{USERNAME}, 'root', "Current user is root. FIXME."); +is($ENV{USERNAME}, 'root', "Current user is root. FIXME. Should NOT!"); # TODO remove this once packaged sub pkg_check { my ($pkg) = @_; return system("rpm -q $pkg >/dev/null") } @@ -39,15 +41,6 @@ foreach my $p (@packages) { is(pkg_check($p), 0, sprintf("%s is installed.", $p)); } -# check if all necessary files are available - FIXME not to use if not final release -ok -r $image_path . '.md5', 'MD5 checksum is available.'; -ok -r $image_path . '.sha1', 'SHA1 checkum is available.'; -ok -r $image_path . '.md5.gpg', 'MD5.gpg is available.'; -ok -r $image_path . '.sha1.gpg', 'SHA1.gpg is available.'; -ok -r $image_path . '.idx', 'IDX is available.'; -# TODO check if LiveCD or not, so .idx or .lst -#ok -r $image_path . '.lst', 'LST is available.'; - # is ISO mount point readable? ok -r $image_path, 'ISO mount point is readable.' or diag("$image_path: $!"); @@ -57,6 +50,6 @@ ok -r $image_path, 'ISO mount point is readable.' my $nb_packet = 2; my $server = "google.com"; my $result = `ping -c $nb_packet $server | grep received | sed 's/ //g' | cut -d, -f 2 | cut -c 1 | tr -d '\n'`; -is ($result, $nb_packet, "Network available"); +is ($result, $nb_packet, "Network is available"); done_testing(); -- cgit v1.2.1