···23 def __init__(self, jid, password):
24 ClientXMPP.__init__(self, jid, password)
25 self.add_event_handler("session_start", self.session_start)
26+ self.test_succeeded = False
2728 async def session_start(self, event):
29+ try:
30+ # Exceptions in event handlers are printed to stderr but not
31+ # propagated, they do not make the script terminate with a non-zero
32+ # exit code. We use the `test_succeeded` flag as a workaround and
33+ # check it later at the end of the script to exit with a proper
34+ # exit code.
35+ # Additionally, this flag ensures that this event handler has been
36+ # actually run by ClientXMPP, which may well not be the case.
37+ await self.test_xmpp_server()
38+ self.test_succeeded = True
39+ finally:
40+ # Even if an exception happens in `test_xmpp_server()`, we still
41+ # need to disconnect explicitly, otherwise the process will hang
42+ # forever.
43+ self.disconnect(wait=True)
44+45+ async def test_xmpp_server(self):
46 log = logging.getLogger(__name__)
47 self.send_presence()
48 self.get_roster()
···60 log.error("ERROR: Cannot run upload command. XEP_0363 seems broken")
61 sys.exit(1)
62 log.info('Upload success!')
63+64 # Test MUC
65+ # TODO: use join_muc_wait() after slixmpp 1.8.0 is released.
66+ self.plugin['xep_0045'].join_muc('testMucRoom', 'cthon98')
67 log.info('MUC join success!')
68 log.info('XMPP SCRIPT TEST SUCCESS')
0697071if __name__ == '__main__':
···81 ct.register_plugin('xep_0045')
82 ct.connect(("server", 5222))
83 ct.process(forever=False)
84+85+ if not ct.test_succeeded:
86+ sys.exit(1)
87''
···1+Remove warning "WARN[0000] Found default OCIruntime /nix/store/.../bin/crun path which is missing from [engine.runtimes] in containers.conf
2+3+It doesn't make sense as we promote using the podman wrapper where runtime paths will vary because they are nix store paths.
4+---
5+ vendor/github.com/containers/common/pkg/config/config.go | 3 +--
6+ 1 file changed, 1 insertion(+), 2 deletions(-)
7+8+diff --git a/vendor/github.com/containers/common/pkg/config/config.go b/vendor/github.com/containers/common/pkg/config/config.go
9+index 4a98c7e92..4a95a2a49 100644
10+--- a/vendor/github.com/containers/common/pkg/config/config.go
11++++ b/vendor/github.com/containers/common/pkg/config/config.go
12+@@ -605,8 +605,7 @@ func (c *EngineConfig) findRuntime() string {
13+ return name
14+ }
15+ }
16+- if path, err := exec.LookPath(name); err == nil {
17+- logrus.Warningf("Found default OCIruntime %s path which is missing from [engine.runtimes] in containers.conf", path)
18++ if _, err := exec.LookPath(name); err == nil {
19+ return name
20+ }
21+ }
22+--
23+2.30.0