diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-05-13 07:36:16 +1000 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-05-13 07:36:16 +1000 |
| commit | a4fe510a69190162452889cd629fa258084f46ff (patch) | |
| tree | 4da725d8bad7641fb8d9db8b153e61beb313715d /gr-digital/python/qa_packet_headerparser_b.py | |
| parent | c7a2cecdd4e9e04d66b4b20b9debce86696e6290 (diff) | |
| parent | 2405532f945576470d1915a4668b91ff35c05775 (diff) | |
Merge branch 'next' into runtime_pimpl
Conflicts:
gr-blocks/swig/blocks_swig0.i
gr-digital/lib/ofdm_chanest_vcvc_impl.cc
gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc
gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h
gr-digital/lib/ofdm_sync_sc_cfb_impl.cc
gr-digital/lib/packet_header_default.cc
gr-digital/lib/packet_headerparser_b_impl.cc
Diffstat (limited to 'gr-digital/python/qa_packet_headerparser_b.py')
| -rwxr-xr-x | gr-digital/python/qa_packet_headerparser_b.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/gr-digital/python/qa_packet_headerparser_b.py b/gr-digital/python/qa_packet_headerparser_b.py index ff74da5657..cf8e1e932e 100755 --- a/gr-digital/python/qa_packet_headerparser_b.py +++ b/gr-digital/python/qa_packet_headerparser_b.py @@ -48,8 +48,11 @@ class qa_packet_headerparser_b (gr_unittest.TestCase): 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 ) packet_len_tagname = "packet_len" - - src = blocks.vector_source_b(encoded_headers) + random_tag = gr.tag_t() + random_tag.offset = 5 + random_tag.key = pmt.string_to_symbol("foo") + random_tag.value = pmt.from_long(42) + src = blocks.vector_source_b(encoded_headers, tags=(random_tag,)) parser = digital.packet_headerparser_b(32, packet_len_tagname) sink = blocks.message_debug() self.tb.connect(src, parser) @@ -62,7 +65,7 @@ class qa_packet_headerparser_b (gr_unittest.TestCase): msg1 = pmt.to_python(sink.get_message(0)) msg2 = pmt.to_python(sink.get_message(1)) msg3 = pmt.to_python(sink.get_message(2)) - self.assertEqual(msg1, {'packet_len': 4, 'packet_num': 0}) + self.assertEqual(msg1, {'packet_len': 4, 'packet_num': 0, 'foo': 42}) self.assertEqual(msg2, {'packet_len': 2, 'packet_num': 1}) self.assertEqual(msg3, False) @@ -124,8 +127,11 @@ class qa_packet_headerparser_b (gr_unittest.TestCase): self.assertEqual(sink.num_messages(), 2) msg1 = pmt.to_python(sink.get_message(0)) msg2 = pmt.to_python(sink.get_message(1)) - self.assertEqual(msg1, {'packet_len': 193, 'frame_len': 25, 'packet_num': 0}) - self.assertEqual(msg2, {'packet_len': 8, 'frame_len': 1, 'packet_num': 1}) + # Multiply with 4 because unpacked bytes have only two bits + self.assertEqual(msg1, {'packet_len': 193*4, 'frame_len': 25, 'packet_num': 0}) + self.assertEqual(msg2, {'packet_len': 8*4, 'frame_len': 1, 'packet_num': 1}) if __name__ == '__main__': gr_unittest.run(qa_packet_headerparser_b, "qa_packet_headerparser_b.xml") + + |