From 101a1b3f9524c53f44dec82f649932191d27a716 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 17 May 2017 12:40:57 +0200 Subject: [PATCH] tests: fix broken snapshot create tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit by mocking de/activate vmstate volumes. these were broken by 3a8deb551f2c7648865437961b3593d11bf0591b, which introduced activating/deactivating vmstate volumes for KRBD Signed-off-by: Fabian Grünbichler --- test/snapshot-test.pm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/test/snapshot-test.pm b/test/snapshot-test.pm index 43b1515e..5620d010 100644 --- a/test/snapshot-test.pm +++ b/test/snapshot-test.pm @@ -104,6 +104,24 @@ sub mocked_volume_rollback_is_possible { die "volume_rollback_is_possible failed\n"; } +sub mocked_activate_volumes { + my ($storecfg, $volumes) = @_; + die "Storage config not mocked! aborting\n" + if defined($storecfg); + die "wrong volume - fake vmstate expected!\n" + if ((scalar @$volumes != 1) || @$volumes[0] ne "somestorage:state-volume"); + return; +} + +sub mocked_deactivate_volumes { + my ($storecfg, $volumes) = @_; + die "Storage config not mocked! aborting\n" + if defined($storecfg); + die "wrong volume - fake vmstate expected!\n" + if ((scalar @$volumes != 1) || @$volumes[0] ne "somestorage:state-volume"); + return; +} + sub mocked_vdisk_free { my ($storecfg, $vmstate) = @_; die "Storage config not mocked! aborting\n" @@ -454,6 +472,8 @@ printf("Setting up Mocking for PVE::Storage\n"); my $storage_module = new Test::MockModule('PVE::Storage'); $storage_module->mock('config', sub { return undef; }); $storage_module->mock('path', sub { return "/some/store/statefile/path"; }); +$storage_module->mock('activate_volumes', \&mocked_activate_volumes); +$storage_module->mock('deactivate_volumes', \&mocked_deactivate_volumes); $storage_module->mock('vdisk_free', \&mocked_vdisk_free); $storage_module->mock('volume_snapshot', \&mocked_volume_snapshot); $storage_module->mock('volume_snapshot_delete', \&mocked_volume_snapshot_delete);