From be59a5e7dd4046cd9901c5e154ef1027cd67f63a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Iv=C3=A1n=20L=C3=B3pez=20Gonz=C3=A1lez?= Date: Tue, 3 Apr 2018 11:55:46 +0100 Subject: [PATCH 1/2] Fix tests --- test/inst_disks_activate_test.rb | 2 ++ test/lib/clients/umount_finish_test.rb | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/test/inst_disks_activate_test.rb b/test/inst_disks_activate_test.rb index 2a5c3103f..5ba06f2fe 100755 --- a/test/inst_disks_activate_test.rb +++ b/test/inst_disks_activate_test.rb @@ -10,6 +10,8 @@ let(:s390) { false } before do + Y2Storage::StorageManager.create_test_instance + allow(Yast::Linuxrc).to receive(:InstallInf).with("WithFCoE").and_return("0") allow(Yast::UI).to receive(:OpenDialog) allow(Yast::UI).to receive(:CloseDialog) diff --git a/test/lib/clients/umount_finish_test.rb b/test/lib/clients/umount_finish_test.rb index 3711c5d2e..085876cd6 100755 --- a/test/lib/clients/umount_finish_test.rb +++ b/test/lib/clients/umount_finish_test.rb @@ -4,6 +4,10 @@ require "installation/clients/umount_finish" describe Yast::UmountFinishClient do + before do + Y2Storage::StorageManager.create_test_instance + end + subject(:client) { described_class.new } DEFAULT_SUBVOLUME = "@/.snapshots/1/snapshot".freeze From 4b70adedcbb44a23278be9b240a0c5cf55772c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Iv=C3=A1n=20L=C3=B3pez=20Gonz=C3=A1lez?= Date: Tue, 3 Apr 2018 11:55:57 +0100 Subject: [PATCH 2/2] Update version and changelog --- package/yast2-installation.changes | 6 ++++++ package/yast2-installation.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes index f4b019106..664907f2e 100644 --- a/package/yast2-installation.changes +++ b/package/yast2-installation.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 3 10:54:42 UTC 2018 - jlopez@suse.com + +- Fix tests to use correct storage instance (part of fate#318196). +- 4.0.43 + ------------------------------------------------------------------- Fri Mar 23 09:57:56 UTC 2018 - mvidner@suse.com diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec index 4e6ffac15..0aec90b37 100644 --- a/package/yast2-installation.spec +++ b/package/yast2-installation.spec @@ -16,7 +16,7 @@ # Name: yast2-installation -Version: 4.0.42 +Version: 4.0.43 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build