From f22c148b86c175fc80fe9dd43e2d01f2dce9b5e9 Mon Sep 17 00:00:00 2001 From: Logan Cary Date: Fri, 8 Nov 2024 09:56:36 -0500 Subject: [PATCH 1/2] fix grep pattern (cherry picked from commit 6bfc6da5bf93f72ac81a0359e00a147c16fbebfd) --- tests/api2/test_cloud_backup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/api2/test_cloud_backup.py b/tests/api2/test_cloud_backup.py index 504cb4935439a..86937d4d17a17 100644 --- a/tests/api2/test_cloud_backup.py +++ b/tests/api2/test_cloud_backup.py @@ -307,5 +307,5 @@ def test_transfer_setting_choices(): ], indirect=["cloud_backup_task"]) def test_other_transfer_settings(cloud_backup_task, options): run_task(cloud_backup_task.task) - result = ssh(f"grep '{options}' /var/log/middlewared.log") + result = ssh(f'grep "{options}" /var/log/middlewared.log') assert result.strip() != "" From f227dd3dc392a6dc8c1347e8f6df4e5ffb7956f8 Mon Sep 17 00:00:00 2001 From: Logan Cary Date: Fri, 8 Nov 2024 10:10:25 -0500 Subject: [PATCH 2/2] better assertion (cherry picked from commit 05e8968a0a1943830f7fbb5ad29d30f4a00d556d) --- tests/api2/test_cloud_backup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/api2/test_cloud_backup.py b/tests/api2/test_cloud_backup.py index 86937d4d17a17..4039d4a7120c7 100644 --- a/tests/api2/test_cloud_backup.py +++ b/tests/api2/test_cloud_backup.py @@ -308,4 +308,4 @@ def test_transfer_setting_choices(): def test_other_transfer_settings(cloud_backup_task, options): run_task(cloud_backup_task.task) result = ssh(f'grep "{options}" /var/log/middlewared.log') - assert result.strip() != "" + assert options in result