summaryrefslogtreecommitdiff
path: root/gr-blocks/python
diff options
context:
space:
mode:
authorJohnathan Corgan2012-07-04 07:11:51 -0700
committerJohnathan Corgan2012-07-04 07:11:51 -0700
commit4c85f46aee089432b090b988dedbc42091084ba3 (patch)
tree77753a2ddc0384e1552a8ba74b2614c4fa2f5bd0 /gr-blocks/python
parent312de88604d052142f91ae4eb292ccd25fac7963 (diff)
downloadgnuradio-4c85f46aee089432b090b988dedbc42091084ba3.tar.gz
gnuradio-4c85f46aee089432b090b988dedbc42091084ba3.tar.bz2
gnuradio-4c85f46aee089432b090b988dedbc42091084ba3.zip
blocks: added gr::blocks::or_XX (bb ss ii)
Diffstat (limited to 'gr-blocks/python')
-rwxr-xr-xgr-blocks/python/qa_boolean_operators.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/gr-blocks/python/qa_boolean_operators.py b/gr-blocks/python/qa_boolean_operators.py
index dc011c14e..43de72a89 100755
--- a/gr-blocks/python/qa_boolean_operators.py
+++ b/gr-blocks/python/qa_boolean_operators.py
@@ -143,12 +143,11 @@ class test_boolean_operators (gr_unittest.TestCase):
self.assertEqual(dst.data(), expected_result)
- """
def test_or_ss (self):
src1_data = (1, 2, 3, 0x5004, 0x1150)
src2_data = (8, 2, 1 , 0x0508, 0x1105)
expected_result = (9, 2, 3, 0x550C, 0x1155)
- op = gr.or_ss ()
+ op = blocks_swig.or_ss ()
self.help_ss ((src1_data, src2_data),
expected_result, op)
@@ -157,7 +156,7 @@ class test_boolean_operators (gr_unittest.TestCase):
src2_data = (8, 2, 2, 1 , 0x08, 0x05)
src3_data = (8, 2, 1, 1 , 0x08, 0x05)
expected_result = (9, 2, 3, 3, 0x0C, 0x55)
- op = gr.or_bb ()
+ op = blocks_swig.or_bb ()
self.help_bb ((src1_data, src2_data, src3_data),
expected_result, op)
@@ -165,11 +164,10 @@ class test_boolean_operators (gr_unittest.TestCase):
src1_data = (1, 2, 3, 0x50005004, 0x11001150)
src2_data = (8, 2, 1 , 0x05000508, 0x11001105)
expected_result = (9, 2, 3, 0x5500550C, 0x11001155)
- op = gr.or_ii ()
+ op = blocks_swig.or_ii ()
self.help_ii ((src1_data, src2_data),
expected_result, op)
- """
def test_not_ss (self):
src1_data = (1, 2, 3, 0x5004, 0x1150)
expected_result = (~1, ~2, ~3, ~0x5004, ~0x1150)