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 <f.eb...@proxmox.com>
---
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 7003f28b..34455804 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 (>= 8.3.2),
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 7a31cfc3..c0d1ac93 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 ff5fbaff..ccf3dd47 100755
--- a/test/replication_test2.pl
+++ b/test/replication_test2.pl
@@ -51,7 +51,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 54004c70..192be476 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 38fef0e3..b3dfa5ff 100755
--- a/test/replication_test4.pl
+++ b/test/replication_test4.pl
@@ -42,7 +42,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 b884881e..64717a6a 100755
--- a/test/replication_test5.pl
+++ b/test/replication_test5.pl
@@ -100,7 +100,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',
},
@@ -122,7 +122,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 5b2303b5..0e547d34 100755
--- a/test/replication_test6.pl
+++ b/test/replication_test6.pl
@@ -42,7 +42,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.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
