Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package os-autoinst for openSUSE:Factory
checked in at 2025-06-20 16:48:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/os-autoinst (Old)
and /work/SRC/openSUSE:Factory/.os-autoinst.new.31170 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-autoinst"
Fri Jun 20 16:48:41 2025 rev:519 rq:1286620 version:5.1750149141.e9a7b3a
Changes:
--------
--- /work/SRC/openSUSE:Factory/os-autoinst/os-autoinst.changes 2025-06-17
18:22:45.815657450 +0200
+++ /work/SRC/openSUSE:Factory/.os-autoinst.new.31170/os-autoinst.changes
2025-06-20 16:49:55.257529818 +0200
@@ -1,0 +2,11 @@
+Wed Jun 18 10:27:57 UTC 2025 - ok...@suse.com
+
+- Update to version 5.1750149141.e9a7b3a:
+ * generalhw: fix is_shutdown signature
+ * Workaround coverage issue
+ * Rename `$mock_main` to `$mock_ovs` in OVS unit test
+ * Extend logging in OVS service to debug its occasional unresponsiveness
+ * Support Wait() timeout message from newer versions of x3270
+ * VMWare-related code made compatible with non-GNU ps
+
+-------------------------------------------------------------------
Old:
----
os-autoinst-5.1750077297.e0e64ba.obscpio
New:
----
os-autoinst-5.1750149141.e9a7b3a.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ os-autoinst-devel-test.spec ++++++
--- /var/tmp/diff_new_pack.UwrYqp/_old 2025-06-20 16:49:56.181568033 +0200
+++ /var/tmp/diff_new_pack.UwrYqp/_new 2025-06-20 16:49:56.185568198 +0200
@@ -18,7 +18,7 @@
%define short_name os-autoinst-devel
Name: %{short_name}-test
-Version: 5.1750077297.e0e64ba
+Version: 5.1750149141.e9a7b3a
Release: 0
Summary: Test package for %{short_name}
License: GPL-2.0-or-later
++++++ os-autoinst-openvswitch-test.spec ++++++
--- /var/tmp/diff_new_pack.UwrYqp/_old 2025-06-20 16:49:56.213569356 +0200
+++ /var/tmp/diff_new_pack.UwrYqp/_new 2025-06-20 16:49:56.217569522 +0200
@@ -19,7 +19,7 @@
%define name_ext -test
%define short_name os-autoinst-openvswitch
Name: %{short_name}%{?name_ext}
-Version: 5.1750077297.e0e64ba
+Version: 5.1750149141.e9a7b3a
Release: 0
Summary: test package for %{short_name}
License: GPL-2.0-or-later
++++++ os-autoinst-test.spec ++++++
--- /var/tmp/diff_new_pack.UwrYqp/_old 2025-06-20 16:49:56.245570680 +0200
+++ /var/tmp/diff_new_pack.UwrYqp/_new 2025-06-20 16:49:56.245570680 +0200
@@ -19,7 +19,7 @@
%define name_ext -test
%define short_name os-autoinst
Name: %{short_name}%{?name_ext}
-Version: 5.1750077297.e0e64ba
+Version: 5.1750149141.e9a7b3a
Release: 0
Summary: test package for os-autoinst
License: GPL-2.0-or-later
++++++ os-autoinst.spec ++++++
--- /var/tmp/diff_new_pack.UwrYqp/_old 2025-06-20 16:49:56.273571838 +0200
+++ /var/tmp/diff_new_pack.UwrYqp/_new 2025-06-20 16:49:56.277572003 +0200
@@ -17,7 +17,7 @@
Name: os-autoinst
-Version: 5.1750077297.e0e64ba
+Version: 5.1750149141.e9a7b3a
Release: 0
Summary: OS-level test automation
License: GPL-2.0-or-later
++++++ os-autoinst-5.1750077297.e0e64ba.obscpio ->
os-autoinst-5.1750149141.e9a7b3a.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/os-autoinst-5.1750077297.e0e64ba/script/os-autoinst-openvswitch
new/os-autoinst-5.1750149141.e9a7b3a/script/os-autoinst-openvswitch
--- old/os-autoinst-5.1750077297.e0e64ba/script/os-autoinst-openvswitch
2025-06-16 14:34:57.000000000 +0200
+++ new/os-autoinst-5.1750149141.e9a7b3a/script/os-autoinst-openvswitch
2025-06-17 10:32:21.000000000 +0200
@@ -155,6 +155,7 @@
# We need open3 because otherwise STDERR is captured by systemd.
# In such way we collect the error and send it back in the dbus call as
well.
+ say "Running command: @args";
my $ovs_vsctl_pid = open3($wtr, $rdr, $err, @args);
my @ovs_vsctl_output = <$rdr>;
@@ -180,12 +181,13 @@
}
# uncoverable statement count:1..5
-sub _set_ip ($tap) { system('ip', 'link', 'set', $tap, 'up') }
+sub _set_ip ($tap) { _cmd('ip', 'link', 'set', $tap, 'up') }
dbus_method("set_vlan", ["string", "uint32"], ["int32", "string"]);
sub set_vlan ($self, $tap, $vlan) {
my $return_output;
+ my $return_error;
my $return_code = 1;
my $ovs_vsctl_error;
my $ovs_vsctl_output;
@@ -210,8 +212,9 @@
print $ovs_vsctl_output if length($ovs_vsctl_output) > 0;
return $return_code, $ovs_vsctl_error unless $return_code == 0;
- $return_code = _set_ip($tap);
- return $return_code, $return_code != 0 ? "Failed to set $tap up " : '';
+ ($return_code, $return_error, $return_output) = _set_ip($tap);
+ print $return_output if length($return_output) > 0;
+ return $return_code, $return_code != 0 ? "Failed to set $tap up:
$return_error" : '';
}
dbus_method("unset_vlan", ["string", "uint32"], ["int32", "string"]);
@@ -258,8 +261,10 @@
sub usage ($r) { require Pod::Usage; Pod::Usage::pod2usage($r) }
sub run_dbus($bus = Net::DBus->system, $reactor_main =
Net::DBus::Reactor->main) {
+ say 'Initializing D-Bus service and Open vSwitch';
my $service = $bus->export_service("org.opensuse.os_autoinst.switch");
my $object = OVS->new($service);
+ say 'Running D-Bus service';
$reactor_main->run;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/os-autoinst-5.1750077297.e0e64ba/t/46-os-autoinst-openvswitch.t
new/os-autoinst-5.1750149141.e9a7b3a/t/46-os-autoinst-openvswitch.t
--- old/os-autoinst-5.1750077297.e0e64ba/t/46-os-autoinst-openvswitch.t
2025-06-16 14:34:57.000000000 +0200
+++ new/os-autoinst-5.1750149141.e9a7b3a/t/46-os-autoinst-openvswitch.t
2025-06-17 10:32:21.000000000 +0200
@@ -41,48 +41,52 @@
subtest 'OVS package' => sub {
my $mock_dbus_object = Test::MockModule->new('Net::DBus::Object');
$mock_dbus_object->redefine('new', {});
- my $mock_main = Test::MockModule->new('OVS', no_auto => 1);
+ my $mock_ovs = Test::MockModule->new('OVS', no_auto => 1);
my $wait_for_bridge_called = 0;
- $mock_main->redefine(_wait_for_bridge => sub { $wait_for_bridge_called++
});
- $mock_main->redefine(_bridge_conf => "\tlink/ether 01:23:45:67:89:ab brd
ff:ff:ff:ff:ff:ff\n\tinet 10.0.2.2/15 brd 10.1.255.255 scope global br0");
- $mock_main->redefine(_add_flow => undef);
- my $result = main::run_dbus($mock_dbus);
+ $mock_ovs->redefine(_wait_for_bridge => sub { $wait_for_bridge_called++ });
+ $mock_ovs->redefine(_bridge_conf => "\tlink/ether 01:23:45:67:89:ab brd
ff:ff:ff:ff:ff:ff\n\tinet 10.0.2.2/15 brd 10.1.255.255 scope global br0");
+ $mock_ovs->redefine(_add_flow => undef);
+ my $result;
+ combined_like { $result = main::run_dbus($mock_dbus) }
qr/initializing.*running d-bus/is, 'init sequence logged';
is $result, undef, 'run_dbus() should return 1';
is $wait_for_bridge_called, 1, 'wait_for_bridge was called';
subtest 'can call _ovs_check' => sub {
- $mock_main->redefine(_check_bridge => 'br1');
+ $mock_ovs->redefine(_check_bridge => 'br1');
is OVS::_ovs_check('tap0', 0, 'br1'), 0, 'success';
ok OVS::_ovs_check('tap0', 0, 'br0'), 'wrong bridge';
ok OVS::_ovs_check('something', 0, 'br0'), 'invalid tap name';
ok OVS::_ovs_check('tap0', 'something', 'br0'), 'invalid vlan format';
};
- is((OVS::_cmd('true'))[0], 0, 'can call _cmd');
+ combined_like { $result = (OVS::_cmd('true'))[0] } qr/running command:
true/i, 'running cmd logged';
+ is $result, 0, 'can call _cmd';
- $mock_main->redefine(_ovs_version => '(Open vSwitch) 1.1.1');
+ $mock_ovs->redefine(_ovs_version => '(Open vSwitch) 1.1.1');
is OVS::check_min_ovs_version('1.1.1'), 1, 'can call
check_min_ovs_version';
my $ovs = OVS->new($mock_service);
subtest 'can call set_vlan' => sub {
- $mock_main->redefine(_ovs_version => '(Open vSwitch) 2.8.1');
+ $mock_ovs->redefine(_ovs_version => '(Open vSwitch) 2.8.1');
stderr_like {
ok $ovs->set_vlan('tap0', 1), 'tap0 is not in br0';
} qr/'tap0'/, 'log output for missing tap';
- $mock_main->redefine(_ovs_check => sub { return (0, 1) });
- $mock_main->redefine(_cmd => sub { return (0, '', '') });
- $mock_main->redefine(_set_ip => 0);
+ $mock_ovs->redefine(_ovs_check => sub { return (0, 1) });
+ $mock_ovs->redefine(_cmd => sub { return (0, '', '') });
+ $mock_ovs->redefine(_set_ip => sub { return (0, '', '') });
is(($ovs->set_vlan('tap0', 1))[0], 0, 'can call set_vlan');
};
- $mock_main->redefine(_ovs_check => sub { return (1, 'error') });
+ $mock_ovs->redefine(_ovs_check => sub { return (1, 'error') });
combined_like { is(($ovs->unset_vlan('tap0', 1))[0], 1, 'unset_vlan
handles error'); } qr/error/, 'no unexpected log output from resultset';
- $mock_main->redefine(_ovs_check => sub { return (0, 'error') });
- $mock_main->redefine(_cmd => sub { return (0, '', '') });
+ $mock_ovs->redefine(_ovs_check => sub { return (0, 'error') });
+ $mock_ovs->redefine(_cmd => sub { return (0, '', '') });
is(($ovs->unset_vlan('tap0', 1))[0], 0, 'can call unset_vlan');
- $mock_main->redefine(_ovs_show => 1);
+ $mock_ovs->redefine(_ovs_show => 1);
is(($ovs->show())[0], 1, 'can call show');
+
+ $mock_ovs->unmock($_) for qw(_cmd _ovs_check);
};
done_testing();
++++++ os-autoinst.obsinfo ++++++
--- /var/tmp/diff_new_pack.UwrYqp/_old 2025-06-20 16:49:57.973642147 +0200
+++ /var/tmp/diff_new_pack.UwrYqp/_new 2025-06-20 16:49:57.977642312 +0200
@@ -1,5 +1,5 @@
name: os-autoinst
-version: 5.1750077297.e0e64ba
-mtime: 1750077297
-commit: e0e64ba5d7ed139450c971bf00d1de5a54e0aa1f
+version: 5.1750149141.e9a7b3a
+mtime: 1750149141
+commit: e9a7b3a4249842f6d6295a71eb7add596c76cb1a
