Hello community, here is the log from the commit of package yast2-services-manager for openSUSE:Factory checked in at 2014-12-25 23:21:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-services-manager (Old) and /work/SRC/openSUSE:Factory/.yast2-services-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-services-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-services-manager/yast2-services-manager.changes 2014-12-19 09:37:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-services-manager.new/yast2-services-manager.changes 2014-12-25 23:20:34.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Dec 19 12:14:11 CET 2014 - schubi@suse.de + +- AutoYaST: Moved code from autoyast2 package to import function of + services_manager_target. (bnc#909745) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-services-manager.spec ++++++ --- /var/tmp/diff_new_pack.u9qlnn/_old 2014-12-25 23:20:35.000000000 +0100 +++ /var/tmp/diff_new_pack.u9qlnn/_new 2014-12-25 23:20:35.000000000 +0100 @@ -26,7 +26,6 @@ Name: yast2-services-manager Version: 3.1.39 Release: 0 - BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-services-manager-3.1.39.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.39/package/yast2-services-manager.changes new/yast2-services-manager-3.1.39/package/yast2-services-manager.changes --- old/yast2-services-manager-3.1.39/package/yast2-services-manager.changes 2014-12-17 13:36:12.000000000 +0100 +++ new/yast2-services-manager-3.1.39/package/yast2-services-manager.changes 2014-12-22 16:16:12.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Dec 19 12:14:11 CET 2014 - schubi@suse.de + +- AutoYaST: Moved code from autoyast2 package to import function of + services_manager_target. (bnc#909745) + +------------------------------------------------------------------- Wed Dec 17 12:18:46 CET 2014 - schubi@suse.de - AutoYaST import: initialize Yast::I18n correctly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.39/package/yast2-services-manager.spec new/yast2-services-manager-3.1.39/package/yast2-services-manager.spec --- old/yast2-services-manager-3.1.39/package/yast2-services-manager.spec 2014-12-17 13:36:12.000000000 +0100 +++ new/yast2-services-manager-3.1.39/package/yast2-services-manager.spec 2014-12-22 16:16:12.000000000 +0100 @@ -25,7 +25,6 @@ Name: yast2-services-manager Version: 3.1.39 - Release: 0 BuildArch: noarch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.39/src/modules/services_manager_target.rb new/yast2-services-manager-3.1.39/src/modules/services_manager_target.rb --- old/yast2-services-manager-3.1.39/src/modules/services_manager_target.rb 2014-12-17 13:36:12.000000000 +0100 +++ new/yast2-services-manager-3.1.39/src/modules/services_manager_target.rb 2014-12-22 16:16:12.000000000 +0100 @@ -121,8 +121,14 @@ end def import profile - return false if profile.target.nil? || profile.target.empty? - self.default_target = profile.target + if profile.target.nil? || profile.target.empty? + # setting default_target due the defined environment + self.default_target = (Installation.x11_setup_needed && + Arch.x11_setup_needed && + Pkg.IsSelected("xorg-x11-server")) ? BaseTargets::GRAPHICAL : BaseTargets::MULTIUSER + else + self.default_target = profile.target + end end def inspect diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.39/test/services_manager_test.rb new/yast2-services-manager-3.1.39/test/services_manager_test.rb --- old/yast2-services-manager-3.1.39/test/services_manager_test.rb 2014-12-17 13:36:12.000000000 +0100 +++ new/yast2-services-manager-3.1.39/test/services_manager_test.rb 2014-12-22 16:16:12.000000000 +0100 @@ -5,6 +5,9 @@ module Yast Yast.import 'ServicesManagerTarget' Yast.import 'ServicesManager' + Yast.import 'Installation' + Yast.import 'Arch' + Yast.import 'Pkg' extend Yast::I18n Yast::textdomain "services-manager" @@ -94,6 +97,26 @@ expect(ServicesManagerTarget).to receive(:import).and_call_original expect(ServicesManager.import(data)).to eq(true) end + + it "imports data for systemd target runlevel 3" do + data = { + 'default' => '3' + } + + expect(ServicesManagerTarget).to receive(:import).and_call_original + expect(ServicesManager.import(data)).to eq(true) + expect(ServicesManagerTarget.default_target).to eq("multi-user") + end + + it "imports data for systemd target runlevel 5" do + data = { + 'default' => '5' + } + + expect(ServicesManagerTarget).to receive(:import).and_call_original + expect(ServicesManager.import(data)).to eq(true) + expect(ServicesManagerTarget.default_target).to eq("graphical") + end end context "when using AutoYast profile written in pre-SLE 12 format" do @@ -109,6 +132,44 @@ expect(ServicesManagerTarget).to receive(:import).and_call_original expect(ServicesManager.import(data)).to eq(true) end + + it "imports data for systemd target multi-user" do + data = { + 'default_target' => 'multi-user', + } + + expect(ServicesManagerTarget).to receive(:import).and_call_original + expect(ServicesManager.import(data)).to eq(true) + expect(ServicesManagerTarget.default_target).to eq("multi-user") + end + + it "imports data for systemd target graphical" do + data = { + 'default_target' => 'graphical', + } + + expect(ServicesManagerTarget).to receive(:import).and_call_original + expect(ServicesManager.import(data)).to eq(true) + expect(ServicesManagerTarget.default_target).to eq("graphical") + end + end + + context "when using AutoYast profile without any default_target entry" do + it "setting to multi-user if X11 is not available" do + expect(Installation).to receive(:x11_setup_needed).and_return(false) + expect(ServicesManagerTarget).to receive(:import).and_call_original + expect(ServicesManager.import({})).to eq(true) + expect(ServicesManagerTarget.default_target).to eq("multi-user") + end + + it "setting to graphical if X11 is available" do + expect(Installation).to receive(:x11_setup_needed).and_return(true) + expect(Arch).to receive(:x11_setup_needed).and_return(true) + expect(Pkg).to receive(:IsSelected).with("xorg-x11-server").and_return(true) + expect(ServicesManagerTarget).to receive(:import).and_call_original + expect(ServicesManager.import({})).to eq(true) + expect(ServicesManagerTarget.default_target).to eq("graphical") + end end context "when using AutoYast profile in the current format" do -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org