From 3e8239cb81fd86cfb2dd9e1efceb5b797c7a9505 Mon Sep 17 00:00:00 2001
From: Dave Lanning <davel@cpanel.net>
Date: Thu, 26 Sep 2024 21:09:46 +0000
Subject: [PATCH] Case RE-851: Only run OpenStack GitHub Action when TestSuite
 Passes

Changelog:
---
 .github/workflows/openstack.yml | 2 +-
 .github/workflows/testsuite.yml | 2 +-
 t/ssystem.t                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/openstack.yml b/.github/workflows/openstack.yml
index 2764e9e3b..cd780b566 100644
--- a/.github/workflows/openstack.yml
+++ b/.github/workflows/openstack.yml
@@ -11,7 +11,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}-openstack
   cancel-in-progress: true
 
 env:
diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index 28c8fe0a6..6e6076088 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -12,7 +12,7 @@ on:
   workflow_call:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}-testsuite
   cancel-in-progress: true
 
 jobs:
diff --git a/t/ssystem.t b/t/ssystem.t
index 75c7a745b..227d2d6e7 100644
--- a/t/ssystem.t
+++ b/t/ssystem.t
@@ -28,7 +28,7 @@ my $mock_log_file = Test::MockFile->file('/var/log/elevate-cpanel.log');
 
 my $cpev = cpev->new->_init;
 
-is( cpev->ssystem('nope'), undef, q[ssystem( 'nope' ) is disallowed] );
+is( cpev->ssystem('nope'), 42, q[ssystem( 'nope' ) is disallowed] );
 is( cpev->ssystem('grep'), 42, 'Commands that are not absolute paths are not allowed' );
 
 is( cpev->ssystem('/etc/apache2/conf/httpd.conf'), 42, 'Commands that are not executable are not allowed' );