public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #112801 from erosennin/prosody-tests 

nixos/prosody: fix broken tests
This commit is contained in:
Ninjatrappeur 2021-02-13 15:22:48 +01:00 committed by GitHub
parent 3b77e7c967 3fd5a41676
commit 2f80425e6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/xmpp/prosody.nix
View File

@ -85,7 +85,7 @@ in import ../make-test-python.nix {
server.succeed('prosodyctl status | grep "Prosody is running"') server.succeed('prosodyctl status | grep "Prosody is running"')
server.succeed("create-prosody-users") server.succeed("create-prosody-users")
client.succeed('send-message 2>&1 | grep "XMPP SCRIPT TEST SUCCESS"') client.succeed("send-message")
server.succeed("delete-prosody-users") server.succeed("delete-prosody-users")
''; '';
} }

26
nixos/tests/xmpp/xmpp-sendmessage.nix
View File

@ -23,8 +23,26 @@ class CthonTest(ClientXMPP):
def __init__(self, jid, password): def __init__(self, jid, password):
ClientXMPP.__init__(self, jid, password) ClientXMPP.__init__(self, jid, password)
self.add_event_handler("session_start", self.session_start) self.add_event_handler("session_start", self.session_start)
self.test_succeeded = False
async def session_start(self, event): async def session_start(self, event):
try:
# Exceptions in event handlers are printed to stderr but not
# propagated, they do not make the script terminate with a non-zero
# exit code. We use the `test_succeeded` flag as a workaround and
# check it later at the end of the script to exit with a proper
# exit code.
# Additionally, this flag ensures that this event handler has been
# actually run by ClientXMPP, which may well not be the case.
await self.test_xmpp_server()
self.test_succeeded = True
finally:
# Even if an exception happens in `test_xmpp_server()`, we still
# need to disconnect explicitly, otherwise the process will hang
# forever.
self.disconnect(wait=True)
async def test_xmpp_server(self):
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
self.send_presence() self.send_presence()
self.get_roster() self.get_roster()
@ -42,11 +60,12 @@ class CthonTest(ClientXMPP):
log.error("ERROR: Cannot run upload command. XEP_0363 seems broken") log.error("ERROR: Cannot run upload command. XEP_0363 seems broken")
sys.exit(1) sys.exit(1)
log.info('Upload success!') log.info('Upload success!')
# Test MUC # Test MUC
self.plugin['xep_0045'].join_muc('testMucRoom', 'cthon98', wait=True) # TODO: use join_muc_wait() after slixmpp 1.8.0 is released.
self.plugin['xep_0045'].join_muc('testMucRoom', 'cthon98')
log.info('MUC join success!') log.info('MUC join success!')
log.info('XMPP SCRIPT TEST SUCCESS') log.info('XMPP SCRIPT TEST SUCCESS')
self.disconnect(wait=True)
if __name__ == '__main__': if __name__ == '__main__':
@ -62,4 +81,7 @@ if __name__ == '__main__':
ct.register_plugin('xep_0045') ct.register_plugin('xep_0045')
ct.connect(("server", 5222)) ct.connect(("server", 5222))
ct.process(forever=False) ct.process(forever=False)
if not ct.test_succeeded:
sys.exit(1)
'' ''