From 7d9f13824e9986650a2f46806d6d6714b99780ce Mon Sep 17 00:00:00 2001
From: Nathan West <nathan.west@okstate.edu>
Date: Mon, 5 Oct 2015 18:12:10 -0400
Subject: blocks: add socket_pdu qa
This test shows a current bug in blocks::socket_pdu. The block hangs
in the destructor.
---
gr-blocks/python/blocks/qa_socket_pdu.py | 45 ++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
create mode 100755 gr-blocks/python/blocks/qa_socket_pdu.py
(limited to 'gr-blocks/python')
diff --git a/gr-blocks/python/blocks/qa_socket_pdu.py b/gr-blocks/python/blocks/qa_socket_pdu.py
new file mode 100755
index 0000000000..4dba2bfd45
--- /dev/null
+++ b/gr-blocks/python/blocks/qa_socket_pdu.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+#
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
+from gnuradio import gr, gr_unittest, blocks
+import random
+
+
+class qa_socket_pdu (gr_unittest.TestCase):
+
+ def setUp (self):
+ self.tb = gr.top_block ()
+
+ def tearDown (self):
+ self.tb = None
+
+ def test_001 (self):
+ # Test that blocks can be created and destroyed without hanging
+ port = str(random.Random().randint(0, 30000) + 10000)
+ self.pdu_send = blocks.socket_pdu("UDP_CLIENT", "localhost", port)
+ self.pdu_recv = blocks.socket_pdu("UDP_SERVER", "localhost", port)
+ self.pdu_send = None
+ self.pdu_recv = None
+
+if __name__ == '__main__':
+ gr_unittest.run(qa_socket_pdu, "qa_socket_pdu.xml")
+
--
cgit v1.2.3
From 928fd29a5e19570c7ed55d9a83a5eb487e75fe56 Mon Sep 17 00:00:00 2001
From: Nathan West <nathan.west@okstate.edu>
Date: Mon, 5 Oct 2015 18:17:09 -0400
Subject: blocks: add socket_pdu test using a flowgraph
---
gr-blocks/python/blocks/qa_socket_pdu.py | 62 +++++++++++++++++++++++++++++++-
1 file changed, 61 insertions(+), 1 deletion(-)
(limited to 'gr-blocks/python')
diff --git a/gr-blocks/python/blocks/qa_socket_pdu.py b/gr-blocks/python/blocks/qa_socket_pdu.py
index 4dba2bfd45..db9f53c71e 100755
--- a/gr-blocks/python/blocks/qa_socket_pdu.py
+++ b/gr-blocks/python/blocks/qa_socket_pdu.py
@@ -22,7 +22,8 @@
from gnuradio import gr, gr_unittest, blocks
import random
-
+import pmt
+import time
class qa_socket_pdu (gr_unittest.TestCase):
@@ -40,6 +41,65 @@ class qa_socket_pdu (gr_unittest.TestCase):
self.pdu_send = None
self.pdu_recv = None
+ def test_002 (self):
+ # Send a PDU through a pair of UDP sockets
+ port = str(random.Random().randint(0, 30000) + 10000)
+ srcdata = (0x64, 0x6f, 0x67, 0x65)
+ data = pmt.init_u8vector(srcdata.__len__(), srcdata)
+ pdu_msg = pmt.cons(pmt.PMT_NIL, data)
+
+ self.pdu_source = blocks.message_strobe(pdu_msg, 500)
+ self.pdu_recv = blocks.socket_pdu("UDP_SERVER", "localhost", port)
+ self.pdu_send = blocks.socket_pdu("UDP_CLIENT", "localhost", port)
+
+ self.dbg = blocks.message_debug()
+
+ self.tb.msg_connect(self.pdu_source, "strobe", self.pdu_send, "pdus")
+ self.tb.msg_connect(self.pdu_recv, "pdus", self.dbg, "store")
+
+ self.tb.start ()
+ time.sleep(1)
+ self.tb.stop()
+ self.tb.wait()
+ self.pdu_send = None
+ self.pdu_recv = None
+
+ received = self.dbg.get_message(0)
+ received_data = pmt.cdr(received)
+ msg_data = []
+ for i in xrange(4):
+ msg_data.append(pmt.u8vector_ref(received_data, i))
+ self.assertEqual(srcdata, tuple(msg_data))
+
+ def test_003 (self):
+ # Test that block stops when interacting with streaming interface
+ port = str(random.Random().randint(0, 30000) + 10000)
+ srcdata = (0x73, 0x75, 0x63, 0x68, 0x74, 0x65, 0x73, 0x74, 0x76, 0x65, 0x72, 0x79, 0x70, 0x61, 0x73, 0x73)
+ tag_dict = {"offset": 0}
+ tag_dict["key"] = pmt.intern("len")
+ tag_dict["value"] = pmt.from_long(8)
+ tag1 = gr.python_to_tag(tag_dict)
+ tag_dict["offset"] = 8
+ tag2 = gr.python_to_tag(tag_dict)
+ tags = [tag1, tag2]
+
+ src = blocks.vector_source_b(srcdata, False, 1, tags)
+ ts_to_pdu = blocks.tagged_stream_to_pdu(blocks.byte_t, "len")
+ pdu_send = blocks.socket_pdu("UDP_CLIENT", "localhost", "4141")
+ #pdu_recv = blocks.socket_pdu("UDP_SERVER", "localhost", port)
+ pdu_to_ts = blocks.pdu_to_tagged_stream(blocks.byte_t, "len")
+ head = blocks.head(gr.sizeof_char, 10)
+ sink = blocks.vector_sink_b(1)
+
+ self.tb.connect(src, ts_to_pdu)
+ self.tb.msg_connect(ts_to_pdu, "pdus", pdu_send, "pdus")
+ # a UDP socket connects pdu_send to pdu_recv
+ # TODO: test that the recv socket can be destroyed from downstream
+ # that signals DONE. Also that we get the PDUs we sent
+ #self.tb.msg_connect(pdu_recv, "pdus", pdu_to_ts, "pdus")
+ #self.tb.connect(pdu_to_ts, head, sink)
+ self.tb.run()
+
if __name__ == '__main__':
gr_unittest.run(qa_socket_pdu, "qa_socket_pdu.xml")
--
cgit v1.2.3