[Commit-gnuradio] [gnuradio] 29/46: zeromq: cleanup QA code, still needs have ZMQ_LINGER set to zero

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit c1c9f0fbe22e9fb03d892c30970f6c3f583cad47
Author: Johnathan Corgan <address@hidden>
Date:   Wed May 7 13:35:19 2014 -0700

    zeromq: cleanup QA code, still needs have ZMQ_LINGER set to zero
---
 gnuradio-runtime/python/gnuradio/__init__.py  |  1 +
 gr-zeromq/python/zeromq/CMakeLists.txt        | 17 ++++++++++++++---
 gr-zeromq/python/zeromq/qa_zeromq_pushpull.py | 13 ++++---------
 gr-zeromq/python/zeromq/qa_zeromq_reqrep.py   |  6 ++----
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/gnuradio-runtime/python/gnuradio/__init__.py 
b/gnuradio-runtime/python/gnuradio/__init__.py
index 1e2966b..3988627 100644
--- a/gnuradio-runtime/python/gnuradio/__init__.py
+++ b/gnuradio-runtime/python/gnuradio/__init__.py
@@ -48,3 +48,4 @@ if path.endswith(path_ending):
     __path__.append(os.path.join(build_path, 'gr-fec', 'python'))
     __path__.append(os.path.join(build_path, 'gr-utils', 'python'))
     __path__.append(os.path.join(build_path, 'gr-uhd', 'python'))
+    __path__.append(os.path.join(build_path, 'gr-zeromq', 'python'))
diff --git a/gr-zeromq/python/zeromq/CMakeLists.txt 
b/gr-zeromq/python/zeromq/CMakeLists.txt
index 9185682..66fc65a 100644
--- a/gr-zeromq/python/zeromq/CMakeLists.txt
+++ b/gr-zeromq/python/zeromq/CMakeLists.txt
@@ -39,7 +39,18 @@ GR_PYTHON_INSTALL(
 ########################################################################
 # Handle the unit tests
 ########################################################################
-include(GrTest)
+if(ENABLE_TESTING)
 
-set(GR_TEST_TARGET_DEPS gnuradio-zeromq)
-set(GR_TEST_PYTHON_DIRS ${CMAKE_BINARY_DIR}/swig)
+  set(GR_TEST_TARGET_DEPS "")
+  set(GR_TEST_LIBRARY_DIRS "")
+  set(GR_TEST_PYTHON_DIRS
+    ${CMAKE_BINARY_DIR}/gnuradio-runtime/python
+  )
+
+  include(GrTest)
+  file(GLOB py_qa_test_files "qa_*.py")
+  foreach(py_qa_test_file ${py_qa_test_files})
+    get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
+    GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} ${PYTHON_DASH_B} 
${py_qa_test_file})
+  endforeach(py_qa_test_file)
+endif(ENABLE_TESTING)
diff --git a/gr-zeromq/python/zeromq/qa_zeromq_pushpull.py 
b/gr-zeromq/python/zeromq/qa_zeromq_pushpull.py
index 72c024e..86b85d9 100755
--- a/gr-zeromq/python/zeromq/qa_zeromq_pushpull.py
+++ b/gr-zeromq/python/zeromq/qa_zeromq_pushpull.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 #
-# Copyright 202013 Free Software Foundation, Inc.
+# Copyright 2014 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -21,9 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-from gnuradio import blocks, zeromq
-from gnuradio import eng_notation
+from gnuradio import gr, gr_unittest, blocks, zeromq
 
 class qa_zeromq_pushpull (gr_unittest.TestCase):
 
@@ -35,12 +32,10 @@ class qa_zeromq_pushpull (gr_unittest.TestCase):
 
     def test_001_t (self):
         src_data = [1,2,3,4,5,6,7,8,9]*100
-        print src_data
         src = blocks.vector_source_c(src_data, False, 1)
-        zeromq_push_sink = zeromq.push_sink(gr.sizeof_gr_complex, 1, 
"tcp://*:5555", True)
-        zeromq_pull_source = zeromq.pull_source(gr.sizeof_gr_complex, 1, 
"tcp://localhost:5555", 0.1)
+        zeromq_push_sink = zeromq.push_sink(gr.sizeof_gr_complex, 1, 
"tcp://127.0.0.1:5555", True)
+        zeromq_pull_source = zeromq.pull_source(gr.sizeof_gr_complex, 1, 
"tcp://127.0.0.1:5555", 0.1)
         sink = blocks.vector_sink_c()
-#        print sink.data
         self.tb.connect(src, zeromq_push_sink)
         self.tb.connect(zeromq_pull_source, sink)
         self.tb.run ()
diff --git a/gr-zeromq/python/zeromq/qa_zeromq_reqrep.py 
b/gr-zeromq/python/zeromq/qa_zeromq_reqrep.py
index e520472..85e3121 100755
--- a/gr-zeromq/python/zeromq/qa_zeromq_reqrep.py
+++ b/gr-zeromq/python/zeromq/qa_zeromq_reqrep.py
@@ -35,12 +35,10 @@ class qa_zeromq_reqrep (gr_unittest.TestCase):
 
     def test_001_t (self):
         src_data = [1,2,3,4,5,6,7,8,9]*100
-        print src_data
         src = blocks.vector_source_c(src_data, False, 1)
-        zeromq_rep_sink = zeromq.rep_sink(gr.sizeof_gr_complex, 1, 
"tcp://*:5555", 0.1, True)
-        zeromq_req_source = zeromq.req_source(gr.sizeof_gr_complex, 1, 
"tcp://localhost:5555")
+        zeromq_rep_sink = zeromq.rep_sink(gr.sizeof_gr_complex, 1, 
"tcp://127.0.0.1:5555", 0.1, True)
+        zeromq_req_source = zeromq.req_source(gr.sizeof_gr_complex, 1, 
"tcp://127.0.0.1:5555")
         sink = blocks.vector_sink_c()
-#        print sink.data
         self.tb.connect(src, zeromq_rep_sink)
         self.tb.connect(zeromq_req_source, sink)
         self.tb.run ()