From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 3A35B1FF17C for ; Wed, 23 Jul 2025 13:57:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 881AAFEEE; Wed, 23 Jul 2025 13:58:46 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Wed, 23 Jul 2025 13:57:39 +0200 Message-ID: <20250723115809.96282-5-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250723115809.96282-1-f.ebner@proxmox.com> References: <20250723115809.96282-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753271882055 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.027 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH manager v3 4/6] test: adapt tests to use verbose disk size suffixes X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" The 'disk-size' format in the JSON schema in pve-common was changed to print more verbose, non-ambiguous disk size suffixes. Adapt the tests to match how configurations are actually written now. Bump the corresponding build-dependency in d/control. Signed-off-by: Fiona Ebner --- NOTE: check that version bump is correct when applying. debian/control | 2 +- test/replication_test1.pl | 2 +- test/replication_test2.pl | 2 +- test/replication_test3.pl | 2 +- test/replication_test4.pl | 2 +- test/replication_test5.pl | 4 ++-- test/replication_test6.pl | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/control b/debian/control index ffac171c..603224d6 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper-compat (= 13), libpve-access-control (>= 8.0.7), libpve-cluster-api-perl, libpve-cluster-perl (>= 6.1-6), - libpve-common-perl (>= 8.2.3), + libpve-common-perl (>= 9.0.7), libpve-guest-common-perl (>= 5.1.1), libpve-http-server-perl (>= 2.0-12), libpve-notify-perl, diff --git a/test/replication_test1.pl b/test/replication_test1.pl index 2632959b..f1dbd893 100755 --- a/test/replication_test1.pl +++ b/test/replication_test1.pl @@ -28,7 +28,7 @@ $ReplicationTestEnv::mocked_vm_configs = { 900 => { node => 'node1', snapshots => {}, - ide0 => 'local-lvm:vm-900-disk-1,size=4G', + ide0 => 'local-lvm:vm-900-disk-1,size=4GiB', memory => 512, ide2 => 'none,media=cdrom', }, diff --git a/test/replication_test2.pl b/test/replication_test2.pl index 4ad19df3..e80f8dd8 100755 --- a/test/replication_test2.pl +++ b/test/replication_test2.pl @@ -52,7 +52,7 @@ $ReplicationTestEnv::mocked_vm_configs = { 900 => { node => 'node1', snapshots => {}, - ide0 => 'local-lvm:vm-900-disk-1,size=4G', + ide0 => 'local-lvm:vm-900-disk-1,size=4GiB', memory => 512, ide2 => 'none,media=cdrom', }, diff --git a/test/replication_test3.pl b/test/replication_test3.pl index e3673334..20bd9663 100755 --- a/test/replication_test3.pl +++ b/test/replication_test3.pl @@ -35,7 +35,7 @@ $ReplicationTestEnv::mocked_vm_configs = { 900 => { node => 'node1', snapshots => {}, - ide0 => 'local-lvm:vm-900-disk-1,size=4G', + ide0 => 'local-lvm:vm-900-disk-1,size=4GiB', memory => 512, ide2 => 'none,media=cdrom', }, diff --git a/test/replication_test4.pl b/test/replication_test4.pl index 7b5ec313..fb8d8e32 100755 --- a/test/replication_test4.pl +++ b/test/replication_test4.pl @@ -41,7 +41,7 @@ $ReplicationTestEnv::mocked_vm_configs = { 900 => { node => 'node1', snapshots => {}, - ide0 => 'local-lvm:vm-900-disk-1,size=4G', + ide0 => 'local-lvm:vm-900-disk-1,size=4GiB', memory => 512, ide2 => 'none,media=cdrom', }, diff --git a/test/replication_test5.pl b/test/replication_test5.pl index 68fe6025..5d599a5c 100755 --- a/test/replication_test5.pl +++ b/test/replication_test5.pl @@ -103,7 +103,7 @@ $ReplicationTestEnv::mocked_vm_configs = { 900 => { node => 'node1', snapshots => {}, - ide0 => 'local-zfs:vm-900-disk-1,size=4G', + ide0 => 'local-zfs:vm-900-disk-1,size=4GiB', memory => 512, ide2 => 'none,media=cdrom', }, @@ -125,7 +125,7 @@ for (my $i = 0; $i < 15; $i++) { } # add a new, disk (but disk does not exist, so replication fails) -$ReplicationTestEnv::mocked_vm_configs->{900}->{ide1} = 'local-zfs:vm-900-disk-2,size=4G'; +$ReplicationTestEnv::mocked_vm_configs->{900}->{ide1} = 'local-zfs:vm-900-disk-2,size=4GiB'; for (my $i = 0; $i < 15; $i++) { ReplicationTestEnv::track_jobs($ctime); $ctime += 60; diff --git a/test/replication_test6.pl b/test/replication_test6.pl index 14ec01ab..82022862 100755 --- a/test/replication_test6.pl +++ b/test/replication_test6.pl @@ -41,7 +41,7 @@ $ReplicationTestEnv::mocked_vm_configs = { 900 => { node => 'node1', snapshots => {}, - ide0 => 'local-zfs:vm-900-disk-1,size=4G', + ide0 => 'local-zfs:vm-900-disk-1,size=4GiB', memory => 512, ide2 => 'none,media=cdrom', }, -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel