commit 2f80425e6e33cf3279ae508c71da34aea0bda9c6 · pyrox.dev/nixpkgs

+1 -1

nixos/tests/xmpp/prosody.nix

···

       85
       85
        
           server.succeed('prosodyctl status | grep "Prosody is running"')

     

       86
       86
        
       

     

       87
       87
        
           server.succeed("create-prosody-users")

     

       88
       88
       -
           client.succeed('send-message 2>&1 | grep "XMPP SCRIPT TEST SUCCESS"')

     

       88
       88
       +
           client.succeed("send-message")

     

       89
       89
        
           server.succeed("delete-prosody-users")

     

       90
       90
        
         '';

     

       91
       91
        
       }

+24 -2

nixos/tests/xmpp/xmpp-sendmessage.nix

···

       23
       23
        
           def __init__(self, jid, password):

     

       24
       24
        
               ClientXMPP.__init__(self, jid, password)

     

       25
       25
        
               self.add_event_handler("session_start", self.session_start)

     

       26
       26
       +
               self.test_succeeded = False

     

       26
       27
        
       

     

       27
       28
        
           async def session_start(self, event):

     

       29
       29
       +
               try:

     

       30
       30
       +
                   # Exceptions in event handlers are printed to stderr but not

     

       31
       31
       +
                   # propagated, they do not make the script terminate with a non-zero

     

       32
       32
       +
                   # exit code. We use the `test_succeeded` flag as a workaround and

     

       33
       33
       +
                   # check it later at the end of the script to exit with a proper

     

       34
       34
       +
                   # exit code.

     

       35
       35
       +
                   # Additionally, this flag ensures that this event handler has been

     

       36
       36
       +
                   # actually run by ClientXMPP, which may well not be the case.

     

       37
       37
       +
                   await self.test_xmpp_server()

     

       38
       38
       +
                   self.test_succeeded = True

     

       39
       39
       +
               finally:

     

       40
       40
       +
                   # Even if an exception happens in `test_xmpp_server()`, we still

     

       41
       41
       +
                   # need to disconnect explicitly, otherwise the process will hang

     

       42
       42
       +
                   # forever.

     

       43
       43
       +
                   self.disconnect(wait=True)

     

       44
       44
       +
       

     

       45
       45
       +
           async def test_xmpp_server(self):

     

       28
       46
        
               log = logging.getLogger(__name__)

     

       29
       47
        
               self.send_presence()

     

       30
       48
        
               self.get_roster()

     
···

       42
       60
        
                   log.error("ERROR: Cannot run upload command. XEP_0363 seems broken")

     

       43
       61
        
                   sys.exit(1)

     

       44
       62
        
               log.info('Upload success!')

     

       63
       63
       +
       

     

       45
       64
        
               # Test MUC

     

       46
       46
       -
               self.plugin['xep_0045'].join_muc('testMucRoom', 'cthon98', wait=True)

     

       65
       65
       +
               # TODO: use join_muc_wait() after slixmpp 1.8.0 is released.

     

       66
       66
       +
               self.plugin['xep_0045'].join_muc('testMucRoom', 'cthon98')

     

       47
       67
        
               log.info('MUC join success!')

     

       48
       68
        
               log.info('XMPP SCRIPT TEST SUCCESS')

     

       49
       49
       -
               self.disconnect(wait=True)

     

       50
       69
        
       

     

       51
       70
        
       

     

       52
       71
        
       if __name__ == '__main__':

     
···

       62
       81
        
           ct.register_plugin('xep_0045')

     

       63
       82
        
           ct.connect(("server", 5222))

     

       64
       83
        
           ct.process(forever=False)

     

       84
       84
       +
       

     

       85
       85
       +
           if not ct.test_succeeded:

     

       86
       86
       +
               sys.exit(1)

     

       65
       87
        
       ''