Merge ec8849c into 6d1a5c9

package/yast2-services-manager.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jun 26 15:07:27 UTC 2018 - igonzalezsosa@suse.com
+
+- Consider a service as enabled when its associated socket is
+  enabled (bsc#1080738)
+- 4.0.4
+
 -------------------------------------------------------------------
 Mon Feb 12 09:45:41 UTC 2018 - knut.anderssen@suse.com
 

package/yast2-services-manager.spec

@@ -24,16 +24,16 @@
 ######################################################################
 
 Name:           yast2-services-manager
-Version:        4.0.3
+Version:        4.0.4
 Release:        0
 BuildArch:      noarch
 
 BuildRoot:      %{_tmppath}/%{name}-build
 Source0:        %{name}-%{version}.tar.bz2
 
 Requires:       ruby
-# Firewalld interfaces helpers
-Requires:       yast2 >= 4.0.51
+# Yast::SystemdServiceClass::Service#socket
+Requires:       yast2 >= 4.0.78
 Requires:       yast2-ruby-bindings >= 1.2.0
 # need new enough installation for its inst clients
 Conflicts:      yast2-installation < 3.1.32
@@ -44,8 +44,8 @@ Conflicts:      yast2-runlevel
 BuildRequires:  ruby
 BuildRequires:  update-desktop-files
 BuildRequires:  yast2-ruby-bindings >= 1.2.0
-# Firewalld interfaces helpers
-BuildRequires:  yast2 >= 4.0.51
+# Yast::SystemdServiceClass::Service#socket
+BuildRequires:  yast2 >= 4.0.78
 # Support for 'data' directory in rake install task
 BuildRequires:  rubygem(yast-rake) >= 0.1.7
 BuildRequires:  rubygem(rspec)

src/modules/services_manager_service.rb

@@ -179,7 +179,7 @@ def extract_services
         # Rest of settings
         service_names.zip(ss).each do |name, s|
           sh = services[name] # service hash
-          sh[:enabled] = s && s.enabled?
+          sh[:enabled] = s && (s.enabled? || !!(s.socket && s.socket.enabled?))
           sh[:active] = s && s.active?
           if !sh[:description] || sh[:description].empty?
             sh[:description] = s ? s.description : ""

test/services_manager_service_test.rb

@@ -17,7 +17,7 @@ def stub_services
 
       all_services = {}
       declare_service = lambda do |name, enabled|
-        d = double(description: "Stub #{name}", enabled?: enabled, active?: true)
+        d = double(description: "Stub #{name}", enabled?: enabled, active?: true, socket: nil)
         all_services[name] = d
       end
 
@@ -215,5 +215,30 @@ def stub_services
       end
     end
 
+    context "when a service is disabled" do
+      let(:dbus) do
+        double("dbus", enabled?: false, active?: true, description: "CUPS", socket: socket)
+      end
+
+      before do
+        allow(SystemdService).to receive(:find_many).and_return([dbus])
+      end
+
+      context "but its socket is enabled" do
+        let(:socket) { double("dbus_socket", enabled?: true) }
+
+        it "considers the system as enabled" do
+          expect(service.all["dbus"][:enabled]).to eq(true)
+        end
+      end
+
+      context "and its socket is disabled" do
+        let(:socket) { double("dbus_socket", enabled?: false) }
+
+        it "considers the system as enabled" do
+          expect(service.all["dbus"][:enabled]).to eq(false)
+        end
+      end
+    end
   end
 end