diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-02-17 10:21:55 -0800 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-02-17 10:21:55 -0800 |
commit | 45082a655dd333af50861b2c03d46c7d654e252c (patch) | |
tree | 09f3a92e8d4e1048fa92563d28e0c614abf4fce5 /gnuradio-core/src/python | |
parent | 9ca6c72a04991a0ec41afcc04b60a85eae52e921 (diff) | |
parent | 8b1d8bd78d21949c1812389986009f4f68f53981 (diff) |
Merge branch 'master' into next
Conflicts:
gnuradio-core/src/lib/io/gr_message_debug.cc
gnuradio-core/src/python/gnuradio/gr/qa_pdu.py
Diffstat (limited to 'gnuradio-core/src/python')
-rwxr-xr-x | gnuradio-core/src/python/gnuradio/gr/qa_pdu.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_pdu.py b/gnuradio-core/src/python/gnuradio/gr/qa_pdu.py index 59f927fa19..00aacdfb11 100755 --- a/gnuradio-core/src/python/gnuradio/gr/qa_pdu.py +++ b/gnuradio-core/src/python/gnuradio/gr/qa_pdu.py @@ -46,7 +46,8 @@ class test_pdu(gr_unittest.TestCase): # Test that the right number of ports exist. pi = dbg.message_ports_in() po = dbg.message_ports_out() - self.assertEqual(pmt.length(pi), 2) + + self.assertEqual(pmt.length(pi), 3) self.assertEqual(pmt.length(po), 0) pi = snk3.message_ports_in() |