Philipp Hörist pushed to branch master at gajim / gajim

Commits: 38218ace by André Apitzsch at 2018-08-18T20:19:01Z Tests: fix imports

- - - - -

4 changed files:

- test/integration/test_resolver.py - test/lib/__init__.py - test/unit/test_jingle.py - test/unit/test_sessions.py

Changes:

===================================== test/integration/test_resolver.py ===================================== --- a/test/integration/test_resolver.py +++ b/test/integration/test_resolver.py @@ -9,7 +9,6 @@ from gi.repository import GLib

from gajim.common import resolver

-from mock import Mock, expectParams from gajim_mocks import * from xmpp_mocks import IdleQueueThread

===================================== test/lib/__init__.py ===================================== --- a/test/lib/__init__.py +++ b/test/lib/__init__.py @@ -55,5 +55,5 @@ def setup_env(): if use_x: from gajim import gtkgui_helpers gtkgui_helpers.GUI_DIR = gajim_root + '/gajim/data/gui' - from gajim.gajim import GajimApplication + from gajim.application import GajimApplication app.app = GajimApplication()

===================================== test/unit/test_jingle.py ===================================== --- a/test/unit/test_jingle.py +++ b/test/unit/test_jingle.py @@ -9,12 +9,11 @@ lib.setup_env() from mock import Mock

from gajim.common.protocol.bytestream import ConnectionIBBytestream, ConnectionSocks5Bytestream -from common.xmpp import dispatcher_nb -from common.xmpp import protocol +from nbxmpp import dispatcher_nb +from nbxmpp import protocol from gajim.common.jingle import ConnectionJingle -from gajim.common import gajim +from gajim.common import app from gajim.common.socks5 import SocksQueue -import gajim.common

session_init = ''' @@ -72,17 +71,17 @@ class Connection(Mock, ConnectionJingle, ConnectionSocks5Bytestream, ConnectionIBBytestream.__init__(self) self.connected = 2 # This tells gajim we are connected

- def send(self, stanza=None, when=None): # Called when gajim wants to send something print(str(stanza))

+ class TestJingle(unittest.TestCase):

def setUp(self): self.dispatcher = dispatcher_nb.XMPPDispatcher() - gajim.nec = Mock() - gajim.socks5queue = SocksQueue(Mock()) + app.nec = Mock() + app.socks5queue = SocksQueue(Mock()) # Setup mock client self.client = Connection() self.client.__str__ = lambda: 'Mock' # FIXME: why do I need this one? @@ -99,10 +98,10 @@ class TestJingle(unittest.TestCase): a lot of places. It is easier to just copy it in here. If the session_initiate stanza changes, this also must change. ''' - self.recieve_file = {'stream-methods': + self.receive_file = {'stream-methods': 'http://jabber.org/protocol/bytestreams', 'sender': 'jtest@thiessen.im/Gajim', - 'file-name': 'test_recieved_file', + 'file-name': 'test_received_file', 'request-id': '43', 'sid': '39', 'session-sid': '38', 'session-type': 'jingle', 'transfered_size': [], 'receiver': @@ -132,26 +131,23 @@ class TestJingle(unittest.TestCase):

def _simulate_jingle_session(self):

- self.dispatcher.RegisterHandler('iq', self.con._JingleCB, 'set' - , common.xmpp.NS_JINGLE) + self.dispatcher.RegisterHandler('iq', self.con._JingleCB, 'set', + protocol.NS_JINGLE) self.dispatcher.ProcessNonBlocking(session_init) session = list(self.con._sessions.values())[0] # The only session we have jft = list(session.contents.values())[0] # jingleFT object - jft.file_props = self.recieve_file # We plug file_props manually - # The user accepts to recieve the file + jft.file_props = self.receive_file # We plug file_props manually + # The user accepts to receive the file # we have to manually simulate this behavior session.approve_session() - self.con.send_file_approval(self.recieve_file) + self.con.send_file_approval(self.receive_file)

self.dispatcher.ProcessNonBlocking(transport_info)

- def test_jingle_session(self): self._simulate_connect() self._simulate_jingle_session()

- - if __name__ == '__main__': unittest.main()

===================================== test/unit/test_sessions.py ===================================== --- a/test/unit/test_sessions.py +++ b/test/unit/test_sessions.py @@ -13,13 +13,12 @@ from gajim.common import nec from gajim.common import ged from gajim.common.nec import NetworkEvent from gajim.common.modules.message import MessageReceivedEvent -from gajim.common.connection_handlers_events import DecryptedMessageReceivedEvent +from gajim.common.modules.message import DecryptedMessageReceivedEvent import nbxmpp

from gajim.session import ChatControlSession from gajim.roster_window import RosterWindow

-from mock import Mock, expectParams from gajim_mocks import * from data import account1

View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/38218aced1d8d0e773b0fd258c714236b47...