diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-02 15:34:00 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-02 15:34:00 -0500 |
| commit | 521a811c8bf8d2ed4a8222d62b478b47f9760a38 (patch) | |
| tree | bc91e9b80e0cf9028977fe5d22bfb65c663f0bd3 /gr-blocks/python/qa_probe_signal.py | |
| parent | 9a356663e48be1a700dd53c027e1922ce0c24cf9 (diff) | |
| parent | db5fd745919ac0f4bff5fbd528ebeff13536b057 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-blocks/python/qa_probe_signal.py
gr-blocks/swig/blocks_swig.i
Diffstat (limited to 'gr-blocks/python/qa_probe_signal.py')
| -rw-r--r-- | gr-blocks/python/qa_probe_signal.py | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/gr-blocks/python/qa_probe_signal.py b/gr-blocks/python/qa_probe_signal.py index ce526e8a53..6d25a25087 100644 --- a/gr-blocks/python/qa_probe_signal.py +++ b/gr-blocks/python/qa_probe_signal.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2012 Free Software Foundation, Inc. +# Copyright 2012-2013 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,27 +20,24 @@ # Boston, MA 02110-1301, USA. # -import time - from gnuradio import gr, gr_unittest import blocks_swig as blocks -class test_probe_signal (gr_unittest.TestCase): +class test_probe_signal(gr_unittest.TestCase): - def setUp (self): + def setUp(self): self.tb = gr.top_block() - def tearDown (self): + def tearDown(self): self.tb = None def test_001(self): - value = 12.3 repeats = 100 src_data = [value] * repeats src = gr.vector_source_f(src_data) - dst = gr.probe_signal_f() + dst = blocks.probe_signal_f() self.tb.connect(src, dst) self.tb.run() @@ -48,7 +45,6 @@ class test_probe_signal (gr_unittest.TestCase): self.assertAlmostEqual(value, output, places=6) def test_002(self): - vector_length = 10 repeats = 10 value = [0.5+i for i in range(0, vector_length)] @@ -56,7 +52,7 @@ class test_probe_signal (gr_unittest.TestCase): src = gr.vector_source_f(src_data) s2v = blocks.stream_to_vector(gr.sizeof_float, vector_length) - dst = gr.probe_signal_vf(vector_length) + dst = blocks.probe_signal_vf(vector_length) self.tb.connect(src, s2v, dst) self.tb.run() |