Merge pull request #10656 from M0ses/fix_backend_tests

Fix backend tests
openSUSE · Jan 20, 2021 · 6254c71 · 6254c71
2 parents ce8e211 + a5c49a5
commit 6254c71
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/backend/t/0015-BSSched-EventSource-Directory.t b/src/backend/t/0015-BSSched-EventSource-Directory.t
@@ -84,7 +84,7 @@ my $stdout_content;
 	    },
 	    {
 	      'project' => 'devel:languages:perl:CPAN-S',
-	      'evfilename' => 't/data/0015/events/x86_64/package:devel:languages:perl::perl-Unknown-Type',
+	      'evfilename' => 't/data/0015/events/x86_64/package:devel:languages:perl::test-package',
 	      'type' => 'unknown',
 	      'package' => 'perl-SWISH'
 	    },
@@ -223,10 +223,11 @@ $file_name =~ s/\//::/;
 
 $ev_dir = "$eventdir_base/publish/";
 $got = readxml("$ev_dir/$file_name",$BSXML::event);
+delete $got->{time};
 $expected = {
           'repository' => 'openSUSE_Leap_42.1',
           'project' => 'devel:languages:perl',
-          'type' => 'publish'
+          'type' => 'publish',
         };
 
 is_deeply($got,$expected,"Checking sendpublishevent");
@@ -258,8 +259,11 @@ push(@files_to_remove,"$ev_dir/$file_name");
 unshift(@files_to_remove,"$eventdir_base/$arch/$evname");
 
 for (BSUtil::unify(sort {$b cmp $a} @files_to_remove)) {
-  ( -d $_ ) ? rmdir $_ : unlink $_;
-  warn "$_: $!" if $!;
+  if ( -d $_ ) {
+    rmdir $_ || warn "$_: $!"
+  } else {
+    unlink $_ || warn "$_: $!";
+  }
 }
 
 exit 0;

diff --git a/...e:devel:languages:perl::perl-Unknown-Type → ...ackage:devel:languages:perl::test-package b/...e:devel:languages:perl::perl-Unknown-Type → ...ackage:devel:languages:perl::test-package