Merge pull request #492 from yast/review_160825_timeout_error_reports

[Review] Request from 'schubi2' @ 'yast/yast-yast2/review_160825_timeout_error_reports'

library/general/src/modules/Report.rb

@@ -59,10 +59,12 @@ def main
       @display_yesno_messages = true
 
       # timeouts
-      @timeout_errors = 0
-      @timeout_warnings = 0
-      @timeout_messages = 0
-      @timeout_yesno_messages = 0
+      # AutoYaST has different timeout (bnc#887397)
+      @default_timeout = (Mode.auto || Mode.config) ? 10 : 0
+      @timeout_errors = 0 # default: Errors stop the installation
+      @timeout_warnings = @default_timeout
+      @timeout_messages = @default_timeout
+      @timeout_yesno_messages = @default_timeout
 
       # logging flags
       @log_errors = true
@@ -230,12 +232,14 @@ def Import(settings)
 
       # timeouts
       @timeout_errors = Ops.get_integer(@error_settings, "timeout", 0)
-      @timeout_warnings = Ops.get_integer(@warning_settings, "timeout", 0)
-      @timeout_messages = Ops.get_integer(@message_settings, "timeout", 0)
+      @timeout_warnings = Ops.get_integer(@warning_settings, "timeout",
+        @default_timeout)
+      @timeout_messages = Ops.get_integer(@message_settings, "timeout",
+        @default_timeout)
       @timeout_yesno_messages = Ops.get_integer(
         @yesno_message_settings,
         "timeout",
-        0
+        @default_timeout
       )
 
       # logging flags

library/general/test/data/ay_installation.yml

@@ -0,0 +1,17 @@
+---
+"errors":
+  log: true
+  show: true
+  timeout: 10
+"messages":
+  log: true
+  show: true
+  timeout: 10
+"warnings":
+  log: true
+  show: true
+  timeout: 20
+"yesno_messages":
+  log: true
+  show: true
+  timeout: 40

library/general/test/data/ay_profile.yml

@@ -0,0 +1,13 @@
+---
+"errors":
+  log: true
+  show: true
+  timeout: 10
+"warnings":
+  log: true
+  show: true
+  timeout: 20
+"yesno_messages":
+  log: true
+  show: true
+  timeout: 40

library/general/test/data/default_ay_installation.yml

@@ -0,0 +1,17 @@
+---
+"errors":
+  log: true
+  show: true
+  timeout: 0
+"messages":
+  log: true
+  show: true
+  timeout: 10
+"warnings":
+  log: true
+  show: true
+  timeout: 10
+"yesno_messages":
+  log: true
+  show: true
+  timeout: 10

library/general/test/data/default_normal_installation.yml

@@ -0,0 +1,17 @@
+---
+"errors":
+  log: true
+  show: true
+  timeout: 0
+"messages":
+  log: true
+  show: true
+  timeout: 0
+"warnings":
+  log: true
+  show: true
+  timeout: 0
+"yesno_messages":
+  log: true
+  show: true
+  timeout: 0

library/general/test/report_test.rb

@@ -1,8 +1,10 @@
 #! /usr/bin/env rspec
 
 require_relative "test_helper"
+require "yaml"
 
 Yast.import "Report"
+Yast.import "Mode"
 
 describe Yast::Report do
   before { subject.ClearAll }
@@ -121,4 +123,52 @@
       expect(subject.GetMessages(0, 1, 0, 0)).to match(/Message/)
     end
   end
+
+  describe ".Settings" do
+    DATA_DIR = File.join(File.expand_path(File.dirname(__FILE__)), "data")
+    let(:ay_profile) { YAML.load_file(File.join(DATA_DIR, "ay_profile.yml")) }
+    let(:default_normal) { YAML.load_file(File.join(DATA_DIR, "default_normal_installation.yml")) }
+    let(:default_ay) { YAML.load_file(File.join(DATA_DIR, "default_ay_installation.yml")) }
+    let(:result_ay) { YAML.load_file(File.join(DATA_DIR, "ay_installation.yml")) }
+
+    context "while normal installation" do
+      it "check default entries" do
+        allow(Yast::Mode).to receive(:mode).and_return("installation")
+        subject.main
+        expect(subject.Export()).to match(default_normal)
+      end
+    end
+
+    context "while AutoYaST installation" do
+      before(:each) do
+        allow(Yast::Mode).to receive(:mode).and_return("autoinstallation")
+        subject.main
+      end
+
+      it "sets default entries" do
+        expect(subject.Export()).to match(default_ay)
+      end
+      it "check if default entries are not overwritten by empty import" do
+        subject.Import({})
+        expect(subject.Export()).to match(default_ay)
+      end
+      it "set flags via AutoYaST profile" do
+        subject.Import(ay_profile)
+        expect(subject.Export()).to match(result_ay)
+      end
+    end
+
+    context "while AutoYaST cloning system" do
+      before(:each) do
+        allow(Yast::Mode).to receive(:mode).and_return("autoinst_config")
+        subject.main
+      end
+
+      it "AutoYaST default entries will be cloned" do
+        # Set timeout for autoyast to 10 seconds (bnc#887397)
+        expect(subject.Export()).to match(default_ay)
+      end
+    end
+  end
+
 end

package/yast2.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Aug 25 14:17:13 CEST 2016 - schubi@suse.de
+
+- Set AutoYaST default timeout entries for reporting errors
+  correctly and do not overwrite AutoYaST profile settings.
+  (bnc#988949)
+- 3.1.204
+
 -------------------------------------------------------------------
 Tue Aug  9 11:31:45 UTC 2016 - igonzalezsosa@suse.com
 

package/yast2.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        3.1.203
+Version:        3.1.204
 Release:        0
 Summary:        YaST2 - Main Package
 License:        GPL-2.0