From af785a2d390e7517a8f4190584291d414409dff4 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 2 Jan 2025 07:50:12 +0100 Subject: [PATCH 1/2] do not test exact wording in xml exception --- library/xml/test/xml_test.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/xml/test/xml_test.rb b/library/xml/test/xml_test.rb index 3701a89f4..99aed1495 100644 --- a/library/xml/test/xml_test.rb +++ b/library/xml/test/xml_test.rb @@ -129,7 +129,7 @@ it "raises XMLSerializationError when key is not string" do input = { "test" => { "a" => "b", "lest" => :lest, 1 => 2, nil => "t", :symbol => "symbol" } } - expect { subject.YCPToXMLString("test", input) }.to raise_error(Yast::XMLSerializationError, /non-string key.*nil=>"t"/) + expect { subject.YCPToXMLString("test", input) }.to raise_error(Yast::XMLSerializationError) end it "places keys in alphabetic sorting" do @@ -150,13 +150,13 @@ it "raises XMLSerializationError when entry has nil as value" do input = { "test" => { "a" => "b", "b" => "c", "c" => nil, "d" => "e", "e" => "f" } } - expect { subject.YCPToXMLString("test", input) }.to raise_error(Yast::XMLSerializationError, /represent nil, part of .*"c"=>nil/) + expect { subject.YCPToXMLString("test", input) }.to raise_error(Yast::XMLSerializationError) end it "raises XMLSerializationError when entry has a weird value" do input = { "test" => /I am a Regexp/ } - expect { subject.YCPToXMLString("test", input) }.to raise_error(Yast::XMLSerializationError, /represent .*Regexp\//) + expect { subject.YCPToXMLString("test", input) }.to raise_error(Yast::XMLSerializationError) end end @@ -193,7 +193,7 @@ it "raises XMLSerializationError when list contains nil" do input = { "test" => ["a", "b", nil, "d", "e", "f"] } - expect { subject.YCPToXMLString("test", input) }.to raise_error(Yast::XMLSerializationError, /represent nil, part of .*"b", nil/) + expect { subject.YCPToXMLString("test", input) }.to raise_error(Yast::XMLSerializationError) end end From 0b30d361c34c88cd901f894cf10c2bd1f553dfed Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 2 Jan 2025 07:55:08 +0100 Subject: [PATCH 2/2] changes --- package/yast2.changes | 6 ++++++ package/yast2.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/package/yast2.changes b/package/yast2.changes index bb2a441f9..b799fdf57 100644 --- a/package/yast2.changes +++ b/package/yast2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 2 06:51:16 UTC 2025 - Josef Reidinger + +- Fix failing tests with ruby 3.4 (gh#yast/yast-yast2#1314) +- 5.0.11 + ------------------------------------------------------------------- Tue Oct 1 13:28:34 UTC 2024 - Stefan Hundhammer diff --git a/package/yast2.spec b/package/yast2.spec index d2f13e575..fe3bb7c0c 100644 --- a/package/yast2.spec +++ b/package/yast2.spec @@ -17,7 +17,7 @@ Name: yast2 -Version: 5.0.10 +Version: 5.0.11 Release: 0 Summary: YaST2 Main Package