From 9d913093e3977218c48167852a376f32fd4a9fa4 Mon Sep 17 00:00:00 2001 From: melaniekung Date: Thu, 6 Feb 2025 12:33:31 -0800 Subject: [PATCH] Test integration tests --- .github/workflows/integration-tests.yml | 3 ++- config/ProjectConfiguration.class.php | 19 +++++++++++++++++++ lib/model/QubitJob.php | 1 + vendor/net_gearman/Net/Gearman/Client.php | 5 +++++ vendor/net_gearman/Net/Gearman/Manager.php | 1 + 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 5857440919..9c8937f671 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -5,6 +5,7 @@ on: branches: - qa/** - stable/** + - dev/integration-test-test jobs: integration-tests: runs-on: ubuntu-24.04 @@ -114,7 +115,7 @@ jobs: echo 'Print qubit_prod.log' sudo tail ${{ github.workspace }}/log/qubit_prod.log echo 'Print nginx/error.log' - sudo tail /var/log/nginx/error.log + sudo tail -n 30 /var/log/nginx/error.log echo 'Print php8.3-fpm.log' sudo tail /var/log/php8.3-fpm.log - name: Upload Cypress Screenshots diff --git a/config/ProjectConfiguration.class.php b/config/ProjectConfiguration.class.php index 20dafb2252..fa7f9fc4c8 100644 --- a/config/ProjectConfiguration.class.php +++ b/config/ProjectConfiguration.class.php @@ -1,4 +1,23 @@ {$jobName}($jobParams); return $job; diff --git a/vendor/net_gearman/Net/Gearman/Client.php b/vendor/net_gearman/Net/Gearman/Client.php index 7522b93db0..7ebb577350 100644 --- a/vendor/net_gearman/Net/Gearman/Client.php +++ b/vendor/net_gearman/Net/Gearman/Client.php @@ -80,6 +80,8 @@ public function __construct($servers, $timeout = 1000) throw new Net_Gearman_Exception('Invalid servers specified'); } + prodlog('servers',$servers); + $this->serverToSocket = array_flip($servers); foreach ($this->serverToSocket as $server => $dummy) { $conn = null; @@ -279,6 +281,9 @@ protected function submitTask(Net_Gearman_Task $task) ); $s = $this->getConnection($task->uniq); + prodlog('s', $s); + prodlog('type', $type); + prodlog('params', $params); Net_Gearman_Connection::send($s, $type, $params); $s_key = (int)$s; diff --git a/vendor/net_gearman/Net/Gearman/Manager.php b/vendor/net_gearman/Net/Gearman/Manager.php index 45544d9110..2d673192c9 100644 --- a/vendor/net_gearman/Net/Gearman/Manager.php +++ b/vendor/net_gearman/Net/Gearman/Manager.php @@ -221,6 +221,7 @@ public function status() 'capable_workers' => $capable ); } + prodlog('status', $status); return $status; }