6 files changed, 107 insertions, 73 deletions
diff --git a/gr-blocks/python/blocks/CMakeLists.txt b/gr-blocks/python/blocks/CMakeLists.txt
index 19d808b1dd..afb860a075 100644
--- a/gr-blocks/python/blocks/CMakeLists.txt
+++ b/gr-blocks/python/blocks/CMakeLists.txt
@@ -26,7 +26,6 @@ GR_PYTHON_INSTALL(
     parse_file_metadata.py
     stream_to_vector_decimator.py
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/blocks
-    COMPONENT "blocks_python"
 )
 
 ########################################################################
diff --git a/gr-blocks/python/blocks/qa_logger.py b/gr-blocks/python/blocks/qa_logger.py
new file mode 100644
index 0000000000..d2b6b3ee5e
--- /dev/null
+++ b/gr-blocks/python/blocks/qa_logger.py
@@ -0,0 +1,96 @@
+#!/usr/bin/env python
+#
+# Copyright 2016 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
+
+class test_logger (gr_unittest.TestCase):
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def set_and_assert_log_level(self, block, level):
+        block.set_log_level(level)
+        self.assertEqual(block.log_level(), level)
+
+    def test_log_level_for_block(self):
+        # Test the python API for getting and setting log levels of individual block
+        # go through all of the documented log_levels
+        ns = blocks.null_source(1)
+        self.set_and_assert_log_level(ns, "notset")
+        self.set_and_assert_log_level(ns, "debug")
+        self.set_and_assert_log_level(ns, "info")
+        self.set_and_assert_log_level(ns, "notice")
+        self.set_and_assert_log_level(ns, "warn")
+        self.set_and_assert_log_level(ns, "error")
+        self.set_and_assert_log_level(ns, "crit")
+        self.set_and_assert_log_level(ns, "alert")
+        self.set_and_assert_log_level(ns, "emerg")
+        # There's a couple of special cases. "off" == "notset" (specific to gr)
+        # and "fatal" == "emerg" (built in to log4cpp)
+        ns.set_log_level("off")
+        self.assertEqual(ns.log_level(), "notset")
+        ns.set_log_level("fatal")
+        self.assertEqual(ns.log_level(), "emerg")
+        # Make sure exception is throw on bogus data
+        self.assertRaises(RuntimeError, ns.set_log_level, "11")
+
+
+    def test_log_level_for_tb(self):
+        # Test the python API for getting and setting log levels for a top_block
+        nsrc = blocks.null_source(4)
+        nsnk = blocks.null_sink(4)
+        # Set all log levels to a known state
+        nsrc.set_log_level("debug")
+        nsnk.set_log_level("debug")
+        tb = gr.top_block()
+        tb.connect(nsrc, nsnk)
+        # confirm that the tb has log_level of first block
+        self.assertEqual(tb.log_level(), "debug")
+        # confirm that changing tb log_level propagates to connected blocks
+        tb.set_log_level("alert")
+        self.assertEqual(tb.log_level(), "alert")
+        self.assertEqual(nsrc.log_level(), "alert")
+        self.assertEqual(nsnk.log_level(), "alert")
+
+    def test_log_level_for_hier_block(self):
+        # Test the python API for getting and setting log levels for hier blocks
+        nsrc = blocks.null_source(4)
+        nsnk = blocks.null_sink(4)
+        b = blocks.stream_to_vector_decimator(4, 1, 1, 1) # just a random hier block that exists
+        tb = gr.top_block()
+        tb.connect(nsrc, b, nsnk)
+        tb.set_log_level("debug")
+        self.assertEqual(tb.log_level(), "debug")
+        self.assertEqual(nsrc.log_level(), "debug")
+        self.assertEqual(nsnk.log_level(), "debug")
+        self.assertEqual(b.one_in_n.log_level(), "debug")
+        tb.set_log_level("alert")
+        self.assertEqual(tb.log_level(), "alert")
+        self.assertEqual(nsrc.log_level(), "alert")
+        self.assertEqual(nsnk.log_level(), "alert")
+        self.assertEqual(b.one_in_n.log_level(), "alert")
+
+if __name__ == '__main__':
+    gr_unittest.run(test_logger, "test_logger.xml")
diff --git a/gr-blocks/python/blocks/qa_message.py b/gr-blocks/python/blocks/qa_message.py
index 1d677007b4..1d0380d44c 100755
--- a/gr-blocks/python/blocks/qa_message.py
+++ b/gr-blocks/python/blocks/qa_message.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2010,2013 Free Software Foundation, Inc.
+# Copyright 2004,2010,2013,2016 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -100,35 +100,6 @@ class test_message(gr_unittest.TestCase):
         tb.run()
         self.assertEquals(input_data, dst.data())
 
-    def test_301(self):
-        # Use itemsize, limit constructor
-        src = blocks.message_source(gr.sizeof_char)
-        dst = blocks.vector_sink_b()
-	tb = gr.top_block()
-        tb.connect(src, dst)
-        src.msgq().insert_tail(gr.message_from_string('01234'))
-        src.msgq().insert_tail(gr.message_from_string('5'))
-        src.msgq().insert_tail(gr.message_from_string(''))
-        src.msgq().insert_tail(gr.message_from_string('6789'))
-        src.msgq().insert_tail(gr.message(1))                  # send EOF
-        tb.run()
-        self.assertEquals(tuple(map(ord, '0123456789')), dst.data())
-
-    def test_302(self):
-        # Use itemsize, msgq constructor
-        msgq = gr.msg_queue()
-        src = blocks.message_source(gr.sizeof_char, msgq)
-        dst = blocks.vector_sink_b()
-	tb = gr.top_block()
-        tb.connect(src, dst)
-        src.msgq().insert_tail(gr.message_from_string('01234'))
-        src.msgq().insert_tail(gr.message_from_string('5'))
-        src.msgq().insert_tail(gr.message_from_string(''))
-        src.msgq().insert_tail(gr.message_from_string('6789'))
-        src.msgq().insert_tail(gr.message(1))                  # send EOF
-        tb.run()
-        self.assertEquals(tuple(map(ord, '0123456789')), dst.data())
-
     def test_debug_401(self):
         msg = pmt.intern("TESTING")
         src = blocks.message_strobe(msg, 500)
diff --git a/gr-blocks/python/blocks/qa_message_tags.py b/gr-blocks/python/blocks/qa_message_tags.py
deleted file mode 100644
index 0d4f77bf9f..0000000000
--- a/gr-blocks/python/blocks/qa_message_tags.py
+++ /dev/null
@@ -1,27 +0,0 @@
-import time
-
-from gnuradio import gr, gr_unittest, blocks
-
-class test_message_tags (gr_unittest.TestCase):
-
-    def test_1 (self):
-        data = ('hello', 'you', 'there')
-        tx_msgq = gr.msg_queue()
-        rx_msgq = gr.msg_queue()
-        for d in data:
-            tx_msgq.insert_tail(gr.message_from_string(d))
-        tx_msgq.insert_tail(gr.message(1))                  # send EOF
-        tb = gr.top_block()
-        src = blocks.message_source(gr.sizeof_char, tx_msgq, "packet_length")
-        snk = blocks.message_sink(gr.sizeof_char, rx_msgq, False, "packet_length")
-        tb.connect(src, snk)
-        tb.start()
-        time.sleep(1)
-        tb.stop()
-        for d in data:
-            msg = rx_msgq.delete_head()
-            contents = msg.to_string()
-            self.assertEqual(d, contents)
-
-if __name__ == '__main__':
-    gr_unittest.run(test_message_tags, "test_message_tags.xml")
diff --git a/gr-blocks/python/blocks/qa_nlog10.py b/gr-blocks/python/blocks/qa_nlog10.py
index 0194e85d48..c925479f59 100755
--- a/gr-blocks/python/blocks/qa_nlog10.py
+++ b/gr-blocks/python/blocks/qa_nlog10.py
@@ -31,15 +31,15 @@ class test_nlog10(gr_unittest.TestCase):
         self.tb = None
 
     def test_001(self):
-        src_data = (-10, 0, 10, 100, 1000, 10000, 100000)
-        expected_result = (-180, -180, 10, 20, 30, 40, 50)
+        src_data = (1, 10, 100, 1000, 10000, 100000)
+        expected_result = (0, 10, 20, 30, 40, 50)
         src = blocks.vector_source_f(src_data)
         op = blocks.nlog10_ff(10)
         dst = blocks.vector_sink_f()
         self.tb.connect (src, op, dst)
         self.tb.run()
         result_data = dst.data()
-        self.assertFloatTuplesAlmostEqual (expected_result, result_data)
+        self.assertFloatTuplesAlmostEqual (expected_result, result_data, 5)
 
 
 if __name__ == '__main__':
diff --git a/gr-blocks/python/blocks/qa_pdu.py b/gr-blocks/python/blocks/qa_pdu.py
index bbee3605ba..79d39df48b 100755
--- a/gr-blocks/python/blocks/qa_pdu.py
+++ b/gr-blocks/python/blocks/qa_pdu.py
@@ -55,18 +55,17 @@ class test_pdu(gr_unittest.TestCase):
         self.tb.connect(src, snk2)
         self.tb.connect(src, snk3)
         self.tb.msg_connect(snk3, "pdus", dbg, "store")
-        self.tb.start()
 
         # make our reference and message pmts
         port = pmt.intern("pdus")
         msg = pmt.cons( pmt.PMT_NIL, pmt.make_u8vector(16, 0xFF))
 
         # post the message
-        src.to_basic_block()._post(port, msg) # eww, what's that smell?
+        src.to_basic_block()._post(port, msg)
+        src.to_basic_block()._post(pmt.intern("system"),
+                pmt.cons(pmt.intern("done"), pmt.PMT_T))
 
-        while dbg.num_messages() < 1:
-            time.sleep(0.1)
-        self.tb.stop()
+        self.tb.start()
         self.tb.wait()
 
         # Get the vector of data from the vector sink
@@ -98,11 +97,11 @@ class test_pdu(gr_unittest.TestCase):
 
         msg = pmt.cons( pmt.PMT_NIL, pmt.init_f32vector(10, src_data))
         src.to_basic_block()._post(port, msg)
+        src.to_basic_block()._post(pmt.intern("system"),
+                pmt.cons(pmt.intern("done"), pmt.PMT_T))
 
         self.tb.start()
-        #ideally, would wait until we get ten samples
-        time.sleep(0.2)
-        self.tb.stop()
+        self.tb.wait()
 
         self.assertEqual(src_data, list(snk.data()) )
 
@@ -125,9 +124,6 @@ class test_pdu(gr_unittest.TestCase):
         self.tb.connect(src, s2ts, ts2pdu)
         self.tb.msg_connect(ts2pdu, "pdus", dbg, "store")
         self.tb.start()
-        while dbg.num_messages() < 1:
-            time.sleep(0.1)
-        self.tb.stop()
         self.tb.wait()
         result_msg = dbg.get_message(0)
         metadata = pmt.to_python(pmt.car(result_msg))
@@ -138,4 +134,3 @@ class test_pdu(gr_unittest.TestCase):
 
 if __name__ == '__main__':
     gr_unittest.run(test_pdu, "test_pdu.xml")
-