Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🚑️ Fix a few recent regressions #757

Merged
merged 3 commits into from May 2, 2024
Merged

Conversation

zeenix
Copy link
Contributor

@zeenix zeenix commented May 1, 2024

Fixes #756.

zeenix added 3 commits May 1, 2024 21:47
We were assuming that SCM_CREDS is available for all sockets on FreeBSD.
@zeenix
Copy link
Contributor Author

zeenix commented May 1, 2024

@jbeich Could you kindly check if the latest commit here fixes the remaining failing test on FreeBSD?

@jbeich
Copy link

jbeich commented May 2, 2024

All tests pass now
$ cargo test --features bus-impl -- --skip fdpass_systemd
    Finished test [unoptimized + debuginfo] target(s) in 0.14s
     Running unittests src/lib.rs (target/debug/deps/zbus-642bfa0488d507d6)

running 42 tests
test address::tests::stringify_dbus_addresses ... ok
test address::tests::parse_dbus_addresses ... ok
test connection::handshake::tests::anonymous_handshake ... ok
test address::tests::connect_tcp ... ok
test connection::handshake::tests::handshake ... ok
test address::tests::connect_nonce_tcp ... ok
test connection::handshake::tests::separate_external_data ... ok
test connection::handshake::tests::separate_anonymous_data ... ok
test blocking::proxy::tests::signal ... ok
test connection::handshake::tests::pipelined_handshake ... ok
test connection::p2p_tests::channel_pair ... ok
test fdo::tests::error_from_zerror ... ok
test connection::p2p_tests::unix_p2p_cookie_auth ... ok
test connection::p2p_tests::unix_p2p ... ok
test guid::tests::generate ... ok
test message::fields::tests::test ... ok
test message::header::tests::header ... ok
test connection::handshake::tests::missing_external_data ... ok
test blocking::connection::tests::unix_p2p ... ok
test message::tests::test ... ok
test proxy::builder::tests::builder ... ok
test message::builder::tests::test_raw ... ok
test tests::basic_connection ... ok
test tests::basic_connection_async ... ok
test fdo::tests::no_object_manager_signals_before_hello ... ok
test tests::freedesktop_api_async ... ok
test proxy::tests::signal_stream_deadlock ... ok
test tests::issue_121 ... ignored
test proxy::tests::signal ... ok
test tests::issue104 ... ok
test tests::issue_466 ... ignored
test fdo::tests::signal ... ok
test tests::issue_81 ... ignored
test tests::msg ... ok
test tests::issue_260 ... ok
test connection::tests::disconnect_on_drop ... ok
test tests::issue_68 ... ok
test tests::freedesktop_api ... ok
test tests::uncached_property ... ok
test tests::issue173 ... ok
test tests::issue_122 ... ok
test connection::p2p_tests::tcp_p2p ... ok

test result: ok. 39 passed; 0 failed; 3 ignored; 0 measured; 1 filtered out; finished in 0.16s

     Running tests/e2e.rs (target/debug/deps/e2e-961907f1a1bc8f35)

running 2 tests
test iface_and_proxy_unix_p2p ... ok
test iface_and_proxy ... ok

test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.07s

     Running unittests src/lib.rs (target/debug/deps/zbus_macros-25777906f14bb11d)

running 0 tests

test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s

     Running tests/tests.rs (target/debug/deps/tests-6a6728b3eb5d10b2)

running 6 tests
test test_interface ... ok
test signal_from_message::signal_string ... ok
test signal_from_message::signal_u8 ... ok
test signal_from_message::wrong_data ... ok
test test_derive_error ... ok
test test_proxy ... ok

test result: ok. 6 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.01s

     Running unittests src/lib.rs (target/debug/deps/zbus_names-29d6994c94b9263e)

running 0 tests

test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s

     Running unittests src/lib.rs (target/debug/deps/zbus_xml-735c195a7cc9003a)

running 0 tests

test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s

     Running tests/tests.rs (target/debug/deps/tests-8ce993b926f1bb47)

running 2 tests
test invalid_arg_type ... ok
test serde ... ok

test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s

     Running unittests src/lib.rs (target/debug/deps/zbus_xmlgen-e6c15746e408a250)

running 0 tests

test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s

     Running unittests src/main.rs (target/debug/deps/zbus_xmlgen-add30a020e59c6e8)

running 0 tests

test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s

     Running tests/gen.rs (target/debug/deps/gen-d476de8e98074e8d)

running 1 test
test sample_object0 ... ok

test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.03s

     Running unittests src/lib.rs (target/debug/deps/zvariant-881168b522e02720)

running 40 tests
test object_path::unit::owned_from_reader ... ok
test optional::tests::bool_in_optional ... ok
test owned_value::tests::from_value ... ok
test owned_value::tests::map_conversion ... ok
test signature::tests::signature_equality ... ok
test str::tests::from_string ... ok
test str::tests::test_ordering ... ok
test tests::array_value ... ok
test tests::dict_compare ... ok
test tests::derive ... ok
test tests::dict_value ... ok
test tests::enums ... ok
test tests::f64_value ... ok
test tests::i16_value ... ok
test tests::fd_value ... ok
test tests::i8_value ... ok
test tests::ip_addr ... ok
test tests::issue_59 ... ok
test tests::object_path_value ... ok
test tests::recursion_limits ... ok
test tests::signature_value ... ok
test tests::serialized_size ... ok
test signature::tests::bytes_equality ... ok
test tests::i32_value ... ok
test tests::i64_value ... ok
test tests::str_value ... ok
test tests::struct_byte_array ... ok
test tests::struct_ref ... ok
test tests::struct_value ... ok
test tests::struct_with_hashmap ... ok
test tests::u32_value ... ok
test tests::u8_value ... ok
test tests::unit ... ok
test tests::unit_fds ... ok
test tests::value_value ... ok
test value::tests::value_display ... ok
test owned_value::tests::bitflags ... ok
test tests::u16_value ... ok
test signature::tests::signature_slicing ... ok
test owned_value::tests::serde ... ok

test result: ok. 40 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.01s

     Running unittests src/lib.rs (target/debug/deps/zvariant_derive-ac0b058816f0f91d)

running 0 tests

test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s

     Running tests/no_prelude.rs (target/debug/deps/no_prelude-fd3e694e3161fb12)

running 0 tests

test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s

     Running tests/tests.rs (target/debug/deps/tests-1178e9707e9482bd)

running 4 tests
test derive_dict ... ok
test derive_struct ... ok
test derive_enum ... ok
test derive_unit_struct ... ok

test result: ok. 4 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s

     Running unittests src/lib.rs (target/debug/deps/zvariant_utils-b32fad73b0aeac78)

running 0 tests

test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s

   Doc-tests zbus

running 42 tests
test zbus/src/connection/builder.rs - connection::builder::Builder<'a>::address (line 93) - compile ... ok
test zbus/src/blocking/object_server.rs - blocking::object_server::ObjectServer (line 85) - compile ... ok
test zbus/src/blocking/object_server.rs - blocking::object_server::InterfaceRef<I>::get_mut (line 41) - compile ... ok
test zbus/src/blocking/object_server.rs - blocking::object_server::ObjectServer::interface (line 186) - compile ... ok
test zbus/src/connection/mod.rs - connection::Connection (line 151) - compile ... ok
test zbus/src/lib.rs - (line 31) - compile ... ok
test zbus/src/lib.rs - (line 76) - compile ... ok
test zbus/src/connection/builder.rs - connection::builder::Builder<'a>::max_queued (line 269) ... ok
test zbus/src/blocking/connection/builder.rs - blocking::connection::builder::Builder<'a>::max_queued (line 166) ... ok
test zbus/src/lib.rs - doctests (line 111) - compile ... ok
test zbus/src/lib.rs - doctests (line 122) - compile ... ok
test zbus/src/blocking/message_iterator.rs - blocking::message_iterator::MessageIterator::for_match_rule (line 42) ... ok
test zbus/src/lib.rs - doctests (line 132) - compile ... ok
test zbus/src/connection/mod.rs - connection::Connection (line 124) ... ok
test zbus/src/blocking/proxy/mod.rs - blocking::proxy::Proxy (line 30) ... ok
test zbus/src/connection/mod.rs - connection::Connection::request_name_with_flags (line 523) ... ok
test zbus/src/connection/mod.rs - connection::Connection::executor (line 828) ... ok
test zbus/src/lib.rs - doctests (line 156) - compile ... ok
test zbus/src/lib.rs - doctests (line 174) - compile ... ok
test zbus/src/lib.rs - doctests (line 345) - compile ... ok
test zbus/src/lib.rs - doctests (line 177) - compile ... ok
test zbus/src/lib.rs - doctests (line 231) - compile ... ok
test zbus/src/lib.rs - doctests (line 42) - compile ... ok
test zbus/src/lib.rs - doctests (line 345) - compile ... ok
test zbus/src/lib.rs - doctests (line 413) - compile ... ok
test zbus/src/lib.rs - doctests (line 329) ... ok
test zbus/src/lib.rs - doctests (line 72) - compile ... ok
test zbus/src/lib.rs - doctests (line 48) - compile ... ok
test zbus/src/lib.rs - doctests (line 225) - compile ... ok
test zbus/src/lib.rs - doctests (line 77) - compile ... ok
test zbus/src/lib.rs - doctests (line 37) ... ok
test zbus/src/lib.rs - doctests (line 543) ... ok
test zbus/src/object_server/mod.rs - object_server::ObjectServer (line 425) - compile ... ok
test zbus/src/object_server/mod.rs - object_server::InterfaceRef<I>::get_mut (line 122) - compile ... ok
test zbus/src/object_server/mod.rs - object_server::ObjectServer::interface (line 606) - compile ... ok
test zbus/src/match_rule/builder.rs - match_rule::builder::Builder<'m>::arg0ns (line 210) ... ok
test zbus/src/lib.rs - doctests (line 590) ... ok
test zbus/src/lib.rs - doctests (line 59) ... ok
test zbus/src/match_rule/mod.rs - match_rule::MatchRule (line 31) ... ok
test zbus/src/message/mod.rs - message::Message::body (line 247) ... ok
test zbus/src/message_stream.rs - message_stream::MessageStream::for_match_rule (line 59) ... ok
test zbus/src/proxy/mod.rs - proxy::Proxy (line 38) ... ok

test result: ok. 42 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 4.64s

   Doc-tests zbus_macros

running 3 tests
test zbus_macros/src/lib.rs - proxy (line 109) - compile ... ok
test zbus_macros/src/lib.rs - interface (line 294) ... ok
test zbus_macros/src/lib.rs - derive_dbus_error (line 397) ... ok

test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.41s

   Doc-tests zbus_names

running 7 tests
test zbus_names/src/property_name.rs - property_name::PropertyName (line 19) ... ok
test zbus_names/src/bus_name.rs - bus_name::BusName (line 20) ... ok
test zbus_names/src/well_known_name.rs - well_known_name::WellKnownName (line 19) ... ok
test zbus_names/src/member_name.rs - member_name::MemberName (line 19) ... ok
test zbus_names/src/interface_name.rs - interface_name::InterfaceName (line 19) ... ok
test zbus_names/src/unique_name.rs - unique_name::UniqueName (line 19) ... ok
test zbus_names/src/error_name.rs - error_name::ErrorName (line 21) ... ok

test result: ok. 7 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.34s

   Doc-tests zbus_xml

running 0 tests

test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s

   Doc-tests zbus_xmlgen

running 0 tests

test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s

   Doc-tests zvariant

running 17 tests
test zvariant/src/object_path.rs - object_path::ObjectPath (line 17) ... ok
test zvariant/src/ser.rs - ser::serialized_size (line 40) ... ok
test zvariant/src/ser.rs - ser::to_writer (line 99) ... ok
test zvariant/src/optional.rs - optional::Optional (line 54) ... ok
test zvariant/src/serialize_value.rs - serialize_value::SerializeValue (line 11) ... ok
test zvariant/src/serialized/data.rs - serialized::data::Data<'bytes,'fds>::deserialize (line 128) ... ok
test zvariant/src/signature.rs - signature::Signature (line 93) ... ok
test zvariant/src/serialized/context.rs - serialized::context::Context (line 14) ... ok
test zvariant/src/deserialize_value.rs - deserialize_value::DeserializeValue (line 14) ... ok
test zvariant/src/type.rs - r#type::Type::signature (line 39) ... ok
test zvariant/src/value.rs - value::Value<'a>::downcast (line 358) ... ok
test zvariant/src/value.rs - value::Value<'a>::downcast_ref (line 410) ... ok
test zvariant/src/value.rs - value::Value<'a>::new (line 191) ... ok
test zvariant/src/serialized/data.rs - serialized::data::Data<'bytes,'fds>::deserialize_for_signature (line 160) ... ok
test zvariant/src/value.rs - value::Value (line 38) ... ok
test zvariant/src/lib.rs - (line 25) ... ok
test zvariant/src/value.rs - value::Value (line 57) ... ok

test result: ok. 17 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 2.18s

   Doc-tests zvariant_derive

running 13 tests
test zvariant_derive/src/lib.rs - serialize_dict_macro_derive (line 202) ... ok
test zvariant_derive/src/lib.rs - serialize_dict_macro_derive (line 180) ... ok
test zvariant_derive/src/lib.rs - deserialize_dict_macro_derive (line 247) ... ok
test zvariant_derive/src/lib.rs - deserialize_dict_macro_derive (line 270) ... ok
test zvariant_derive/src/lib.rs - type_macro_derive (line 137) ... ok
test zvariant_derive/src/lib.rs - (line 16) ... ok
test zvariant_derive/src/lib.rs - type_macro_derive (line 27) ... ok
test zvariant_derive/src/lib.rs - value_macro_derive (line 312) ... ok
test zvariant_derive/src/lib.rs - type_macro_derive (line 111) ... ok
test zvariant_derive/src/lib.rs - type_macro_derive (line 54) ... ok
test zvariant_derive/src/lib.rs - value_macro_derive (line 384) ... ok
test zvariant_derive/src/lib.rs - value_macro_derive (line 361) ... ok
test zvariant_derive/src/lib.rs - value_macro_derive (line 335) ... ok

test result: ok. 13 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 1.51s

   Doc-tests zvariant_utils

running 3 tests
test zvariant_utils/src/macros.rs - macros::def_attrs (line 191) ... ok
test zvariant_utils/src/macros.rs - macros::def_attrs (line 175) ... ok
test zvariant_utils/src/macros.rs - macros::def_attrs (line 228) ... ok

test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.19s

@zeenix
Copy link
Contributor Author

zeenix commented May 2, 2024

All tests pass now

Great. Thank you!

@zeenix zeenix merged commit 233f50f into dbus2:main May 2, 2024
6 checks passed
@zeenix zeenix deleted the regressions-fixes branch May 2, 2024 07:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

zbus 4.2.0 breaks server-side handshake on FreeBSD
2 participants