commit dd7924889b4c956da53935e78f2d2cdeb58eb103
parent 82a520dcb6f6cfe538c68fd04a8a7b94f3b177c2
Author: Slack Coder <slackcoder@server.ky>
Date: Thu, 20 Feb 2025 09:50:05 -0500
Fix race-sbofind and travis tests
Diffstat:
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/t/03-travis.t b/t/03-travis.t
@@ -29,7 +29,7 @@ SKIP: {
skip 'Not doing online tests without TEST_ONLINE=1', 2 if $ENV{TEST_ONLINE} ne '1';
sbosnap 'fetch', { expected => qr/\APulling SlackBuilds tree\.\.\.\n/ };
- sbofind 'sbotools', { expected => qr"SBo: sbotools \d[.]\d\nPath: /usr/sbo/repo/system/sbotools\n\n" };
+ sbofind 'sbotools', { expected => qr"SBo:\s+sbotools2\s+\d+[.]\d+[.]\d+\nPath:\s+/usr/sbo/repo/system/sbotools2\n" };
}
# 4-10: Test alternative REPO
diff --git a/t/27-race-sbofind.t b/t/27-race-sbofind.t
@@ -6,7 +6,7 @@ use Test::More;
use Test::Exit;
use FindBin '$RealBin';
use lib $RealBin;
-use Test::Sbotools qw/set_gpg_verify load/;
+use Test::Sbotools qw/set_gpg_verify load sbosnap/;
use Capture::Tiny qw/ capture_merged /;
use File::Temp 'tempdir';
use Cwd;
@@ -18,6 +18,9 @@ set_gpg_verify('FALSE');
load('sbofind');
my $tags_file = '/usr/sbo/repo/TAGS.txt';
+# Test may be run by itself
+sbosnap 'fetch', { test => 0 } if not -d '/usr/sbo/repo';
+
# 1: tags file
{
rename $tags_file, "$tags_file.bak";