more tests, clean some others, enhance helper.pm

1 files changed, 5 insertions, 6 deletions

diff --git a/t/superuser--arch_to_noarch.t b/t/superuser--arch_to_noarch.t
index 3224ea87..1b3869dc 100644
--- a/t/superuser--arch_to_noarch.t
+++ b/t/superuser--arch_to_noarch.t
@@ -1,18 +1,17 @@
 #!/usr/bin/perl
 
 use strict;
+use lib '.', 't';
+use helper;
 use Test::More 'no_plan';
 
-chdir 't' if -d 't';
-require './helper.pm';
-
-helper::need_root_and_prepare();
+need_root_and_prepare();
 
 my $name = 'arch_to_noarch';
 
 foreach my $nb (1 .. 4) {
     my $medium_name = "${name}_$nb";
-    helper::urpmi_addmedia("$medium_name $::pwd/media/$medium_name");
-    helper::urpmi("$name");
+    urpmi_addmedia("$medium_name $::pwd/media/$medium_name");
+    urpmi("$name");
     is(`rpm -qa --root $::pwd/root`, "$name-$nb-1\n");
 }