From 9883ee2481fd9b1b2d429bb220b65d7a3fa9b6f8 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 15 Jan 2025 09:31:26 +0100 Subject: [PATCH 1/3] disable libyui integration tests in ruby-bindings as it is not reliable --- tests/CMakeLists.txt | 3 ++- tests/integration/std_streams_spec.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 913d9d7f..5954ffe1 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -15,7 +15,8 @@ foreach(test ${Specs}) ADD_TEST(${test} rspec --format doc ${test}) endforeach(test) -ADD_TEST("integration" ruby ${CMAKE_CURRENT_SOURCE_DIR}/integration/run.rb) +# disable integration test as it is too fragile on non intel architectures +# ADD_TEST("integration" ruby ${CMAKE_CURRENT_SOURCE_DIR}/integration/run.rb) ADD_TEST("translations" rspec --format doc ${CMAKE_CURRENT_SOURCE_DIR}/integration/translations_spec.rb) file(GLOB libyui_specs "libyui/*_spec.rb") diff --git a/tests/integration/std_streams_spec.rb b/tests/integration/std_streams_spec.rb index 90011994..8dbcd889 100755 --- a/tests/integration/std_streams_spec.rb +++ b/tests/integration/std_streams_spec.rb @@ -14,7 +14,7 @@ def std_puts(message) # Regression test for the fix of bnc#943757 implemented # in libyui-ncurses 2.47.3 -describe "streams redirection in libyui-ncurses" do +xdescribe "streams redirection in libyui-ncurses" do include Yast::UIShortcuts around do |example| From ea820778f522d8f6708a3bbf2be35cf961d81ced Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 15 Jan 2025 09:39:39 +0100 Subject: [PATCH 2/3] Changes --- package/yast2-ruby-bindings.changes | 7 +++++++ package/yast2-ruby-bindings.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/yast2-ruby-bindings.changes b/package/yast2-ruby-bindings.changes index ff6a7190..51175527 100644 --- a/package/yast2-ruby-bindings.changes +++ b/package/yast2-ruby-bindings.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jan 15 08:39:02 UTC 2025 - Josef Reidinger + +- Disable integration tests with libyui + (gh#yast/yast-ruby-bindings#293) +- 5.0.2 + ------------------------------------------------------------------- Fri Dec 20 16:01:56 UTC 2024 - Josef Reidinger diff --git a/package/yast2-ruby-bindings.spec b/package/yast2-ruby-bindings.spec index 86679d22..16f220be 100644 --- a/package/yast2-ruby-bindings.spec +++ b/package/yast2-ruby-bindings.spec @@ -17,7 +17,7 @@ Name: yast2-ruby-bindings -Version: 5.0.1 +Version: 5.0.2 Release: 0 URL: https://github.com/yast/yast-ruby-bindings BuildRoot: %{_tmppath}/%{name}-%{version}-build From 852f09c6c063f655e67cc42d54d68d7c628faf87 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 22 Jan 2025 09:23:02 +0100 Subject: [PATCH 3/3] remove tmux dependency and also disable libyui tests --- package/yast2-ruby-bindings.spec | 11 ----------- tests/CMakeLists.txt | 10 ++++++---- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/package/yast2-ruby-bindings.spec b/package/yast2-ruby-bindings.spec index 16f220be..2c576ee8 100644 --- a/package/yast2-ruby-bindings.spec +++ b/package/yast2-ruby-bindings.spec @@ -48,14 +48,6 @@ BuildRequires: s390-tools Requires: s390-tools %endif - -# The test suite includes a regression test (std_streams_spec.rb) for a -# libyui-ncurses bug fixed in 2.47.3 -BuildRequires: libyui-ncurses >= 2.47.3 -# The mentioned test requires tmux in order to be executed in headless systems -# Also many other libyui tests to come -BuildRequires: tmux - # only a soft dependency, the Ruby debugger is optional Suggests: rubygem(%{rb_default_ruby_abi}:byebug) @@ -96,9 +88,6 @@ make install DESTDIR=$RPM_BUILD_ROOT cd - %check -# Build workers are set up without systemd so the default /run/tmux dir -# will not be present (unless clamav pulls systemd in, on SLE) -export TMUX_TMPDIR=/tmp cd build make test ARGS=-V cd - diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5954ffe1..e411526b 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -19,7 +19,9 @@ endforeach(test) # ADD_TEST("integration" ruby ${CMAKE_CURRENT_SOURCE_DIR}/integration/run.rb) ADD_TEST("translations" rspec --format doc ${CMAKE_CURRENT_SOURCE_DIR}/integration/translations_spec.rb) -file(GLOB libyui_specs "libyui/*_spec.rb") -foreach(test ${libyui_specs}) - ADD_TEST(${test} rspec --format doc ${test}) -endforeach(test) +# disable also libyui tests as it is too fragile on non intel architectures and it is not ruby-bindings job to test it +# if wanted, it can live separately. +# file(GLOB libyui_specs "libyui/*_spec.rb") +# foreach(test ${libyui_specs}) +# ADD_TEST(${test} rspec --format doc ${test}) +# endforeach(test)