Hello community,

here is the log from the commit of package yast2-configuration-management for 
openSUSE:Factory checked in at 2017-05-16 14:45:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-configuration-management (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-configuration-management.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-configuration-management"

Tue May 16 14:45:09 2017 rev:3 rq:494749 version:0.3.3

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/yast2-configuration-management/yast2-configuration-management.changes
    2017-05-10 20:54:02.401023590 +0200
+++ 
/work/SRC/openSUSE:Factory/.yast2-configuration-management.new/yast2-configuration-management.changes
       2017-05-16 14:46:11.086449388 +0200
@@ -1,0 +2,7 @@
+Thu May 11 14:46:33 UTC 2017 - [email protected]
+
+- Do not try to run the provisioner if no configuration was
+  specified (bsc#1038630)
+- Version 0.3.3
+
+-------------------------------------------------------------------

Old:
----
  yast2-configuration-management-0.3.2.tar.bz2

New:
----
  yast2-configuration-management-0.3.3.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-configuration-management.spec ++++++
--- /var/tmp/diff_new_pack.6I7tNd/_old  2017-05-16 14:46:11.746356677 +0200
+++ /var/tmp/diff_new_pack.6I7tNd/_new  2017-05-16 14:46:11.746356677 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-configuration-management
-Version:        0.3.2
+Version:        0.3.3
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ yast2-configuration-management-0.3.2.tar.bz2 -> 
yast2-configuration-management-0.3.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-configuration-management-0.3.2/README.md 
new/yast2-configuration-management-0.3.3/README.md
--- old/yast2-configuration-management-0.3.2/README.md  2017-05-10 
15:13:43.245215225 +0200
+++ new/yast2-configuration-management-0.3.3/README.md  2017-05-12 
03:14:08.908109799 +0200
@@ -1,5 +1,14 @@
 # YaST Configuration Management
 
+[![Build 
Status](https://travis-ci.org/yast/yast-configuration-management.svg?branch=master)](
+  https://travis-ci.org/yast/yast-configuration-management)
+[![Coverage 
Status](https://coveralls.io/repos/github/yast/yast-configuration-management/badge.svg?branch=master)](
+  https://coveralls.io/github/yast/yast-configuration-management?branch=master)
+[![Code 
Climate](https://codeclimate.com/github/yast/yast-configuration-management/badges/gpa.svg)](
+  https://codeclimate.com/github/yast/yast-configuration-management)
+[![Issue 
Count](https://codeclimate.com/github/yast/yast-configuration-management/badges/issue_count.svg)](
+  https://codeclimate.com/github/yast/yast-configuration-management/issues)
+
 This module allows AutoYaST2 to delegate part of the configuration to a
 [Software Configuration 
Management](https://en.wikipedia.org/wiki/Software_configuration_management)
 system. Salt and Puppet are supported.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-configuration-management-0.3.2/package/yast2-configuration-management.changes
 
new/yast2-configuration-management-0.3.3/package/yast2-configuration-management.changes
--- 
old/yast2-configuration-management-0.3.2/package/yast2-configuration-management.changes
     2017-05-10 15:13:43.245215225 +0200
+++ 
new/yast2-configuration-management-0.3.3/package/yast2-configuration-management.changes
     2017-05-12 03:14:08.908109799 +0200
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Thu May 11 14:46:33 UTC 2017 - [email protected]
+
+- Do not try to run the provisioner if no configuration was
+  specified (bsc#1038630)
+- Version 0.3.3
+
+-------------------------------------------------------------------
 Tue May  9 14:07:13 UTC 2017 - [email protected]
 
 - Fix masterless mode (bsc#1038290)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-configuration-management-0.3.2/package/yast2-configuration-management.spec
 
new/yast2-configuration-management-0.3.3/package/yast2-configuration-management.spec
--- 
old/yast2-configuration-management-0.3.2/package/yast2-configuration-management.spec
        2017-05-10 15:13:43.245215225 +0200
+++ 
new/yast2-configuration-management-0.3.3/package/yast2-configuration-management.spec
        2017-05-12 03:14:08.908109799 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-configuration-management
-Version:        0.3.2
+Version:        0.3.3
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-configuration-management-0.3.2/src/lib/configuration_management/clients/configuration_management_finish.rb
 
new/yast2-configuration-management-0.3.3/src/lib/configuration_management/clients/configuration_management_finish.rb
--- 
old/yast2-configuration-management-0.3.2/src/lib/configuration_management/clients/configuration_management_finish.rb
        2017-05-10 15:13:43.245215225 +0200
+++ 
new/yast2-configuration-management-0.3.3/src/lib/configuration_management/clients/configuration_management_finish.rb
        2017-05-12 03:14:08.908109799 +0200
@@ -24,8 +24,9 @@
       # @return [TrueClass,FalseClass] True if configurations have been 
written;
       #                                otherwise it returns false.
       def write
+        return false if config.nil?
         log.info("Provisioning Configuration Management")
-        configurator.prepare if configurator
+        configurator.prepare
         # saving settings to target system
         Yast::ConfigurationManagement::Clients::Provision.new.run
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-configuration-management-0.3.2/test/lib/clients/finish_client_spec.rb 
new/yast2-configuration-management-0.3.3/test/lib/clients/finish_client_spec.rb
--- 
old/yast2-configuration-management-0.3.2/test/lib/clients/finish_client_spec.rb 
    1970-01-01 01:00:00.000000000 +0100
+++ 
new/yast2-configuration-management-0.3.3/test/lib/clients/finish_client_spec.rb 
    2017-05-12 03:14:08.912109799 +0200
@@ -0,0 +1,61 @@
+#!/usr/bin/env rspec
+
+require_relative "../../spec_helper"
+require "configuration_management/clients/configuration_management_finish"
+
+describe Yast::ConfigurationManagement::ConfigurationManagementFinish do
+  subject(:client) { described_class.new }
+
+  describe "#write" do
+    let(:configurator) { double("configurator", prepare: true, services: 
["salt-minion"]) }
+    let(:provision_client) { double("provision_client", run: true) }
+
+    before do
+      allow(Yast::ConfigurationManagement::Configurations::Base).to 
receive(:current)
+        .and_return(config)
+      allow(Yast::ConfigurationManagement::Configurators::Base).to 
receive(:current)
+        .and_return(configurator)
+      allow(Yast::ConfigurationManagement::Clients::Provision).to receive(:new)
+        .and_return(provision_client)
+    end
+
+    context "when not configuration is set" do
+      let(:config) { nil }
+
+      it "does not run the provisioner" do
+        expect(provision_client).to_not receive(:run)
+      end
+
+      it "returns false" do
+        expect(client.write).to eq(false)
+      end
+    end
+
+    context "when configuration is set" do
+      let(:config) { double("config", enable_services: false) }
+
+      it "runs the configurator" do
+        expect(configurator).to receive(:prepare)
+        client.write
+      end
+
+      it "runs the provisioner" do
+        expect(provision_client).to receive(:run)
+        client.write
+      end
+
+      it "returns true" do
+        expect(client.write).to eq(true)
+      end
+    end
+
+    context "when 'enable_services' option is set to true" do
+      let(:config) { double("config", enable_services: true) }
+
+      it "tries to enable services" do
+        expect(Yast::Service).to receive(:Enable).with("salt-minion")
+        client.write
+      end
+    end
+  end
+end


Reply via email to