moksha/api/widgets/amqp/amqp.py | 5 +---- moksha/apps/demo/MokshaJQPlotDemo/jqplotdemo/tests/functional/test_root.py | 2 +- moksha/tests/functional/test_root.py | 2 +- moksha/tests/quickstarts/test_livewidget.py | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-)
New commits: commit 463b62a9fdc10ba5eabd20e22ade8fdd0cc04fe2 Author: Luke Macken lmacken@redhat.com Date: Wed Nov 11 14:26:01 2009 -0500
Update our livewidget tests to handle the new AMQPSocket
diff --git a/moksha/apps/demo/MokshaJQPlotDemo/jqplotdemo/tests/functional/test_root.py b/moksha/apps/demo/MokshaJQPlotDemo/jqplotdemo/tests/functional/test_root.py index b8d4950..525a336 100644 --- a/moksha/apps/demo/MokshaJQPlotDemo/jqplotdemo/tests/functional/test_root.py +++ b/moksha/apps/demo/MokshaJQPlotDemo/jqplotdemo/tests/functional/test_root.py @@ -24,7 +24,7 @@ class TestRootController(TestController): def test_tcpsocket(self): """ Make sure the Moksha socket gets injected """ response = self.app.get('/') - assert_true('TCPSocket' in response) + assert_true('TCPSocket' in response or 'moksha_amqp_conn' in response)
def test_jqplot(self): """ Make sure jQuery is injected properly """ diff --git a/moksha/tests/functional/test_root.py b/moksha/tests/functional/test_root.py index 370af70..a1527ee 100644 --- a/moksha/tests/functional/test_root.py +++ b/moksha/tests/functional/test_root.py @@ -54,4 +54,4 @@ class TestRootController(TestController): def test_tcpsocket(self): """ Ensure our TCP socket is getting injected """ resp = self.app.get('/') - assert 'TCPSocket' in resp + assert 'TCPSocket' in resp or 'moksha_amqp_conn' in resp diff --git a/moksha/tests/quickstarts/test_livewidget.py b/moksha/tests/quickstarts/test_livewidget.py index 1cdcf98..72a505b 100644 --- a/moksha/tests/quickstarts/test_livewidget.py +++ b/moksha/tests/quickstarts/test_livewidget.py @@ -59,7 +59,7 @@ class TestLiveWidgetQuickstart(QuickstartTester): def test_tcpsocket(self): """ Ensure our Orbited TCPSocket is getting injected """ resp = self.app.get('/') - assert 'TCPSocket' in resp + assert 'TCPSocket' in resp or 'moksha_amqp_conn' in resp
def test_livewidget(self): """ Ensure our LiveWidget is available """
commit 628e319c3a09f7d992e8720b468cbdb2ba8c21f9 Author: Luke Macken lmacken@redhat.com Date: Wed Nov 11 14:25:50 2009 -0500
Remove some spurious console.logs
diff --git a/moksha/api/widgets/amqp/amqp.py b/moksha/api/widgets/amqp/amqp.py index 6d0a68c..989913c 100644 --- a/moksha/api/widgets/amqp/amqp.py +++ b/moksha/api/widgets/amqp/amqp.py @@ -90,7 +90,7 @@ class AMQPSocket(Widget): moksha_amqp_remote_queue = null; moksha_amqp_queue = null; moksha_amqp_on_message = function(msg) { - console.log('moksha_amqp_on_message,(' + msg.body + ')'); + console.log('moksha_amqp_on_message(' + msg.body + ')'); var dest = msg.header.delivery_properties.routing_key; var json = $.secureEvalJSON(msg.body); if (moksha_callbacks[dest]) { @@ -120,7 +120,6 @@ class AMQPSocket(Widget): Orbited.settings.port = ${orbited_port}; Orbited.settings.hostname = '${orbited_host}'; Orbited.settings.streaming = true; - console.log('Opening AMQP connection'); moksha_amqp_conn = new amqp.Connection({ host: '${amqp_broker_host}', port: ${amqp_broker_port}, @@ -131,14 +130,12 @@ class AMQPSocket(Widget): }); moksha_amqp_conn.start();
- console.log('Starting AMQP session'); moksha_amqp_session = moksha_amqp_conn.create_session( 'moksha_socket_' + (new Date().getTime() + Math.random()));
moksha_amqp_remote_queue = 'moksha_socket_queue_' + moksha_amqp_session.name;
- console.log('Declaring AMQP queue'); moksha_amqp_session.Queue('declare', { queue: moksha_amqp_remote_queue });
moksha-commits@lists.fedorahosted.org