From 3e33c4655ca02d831ecef17f30264afc962965af Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Wed, 13 Mar 2013 18:55:01 -0400
Subject: audio: minor master merge fix.

blocks: fix QA to turn off controlport (should generalize this).
---
 gr-blocks/python/qa_file_source_sink.py | 1 +
 gr-blocks/python/qa_udp_source_sink.py  | 1 +
 2 files changed, 2 insertions(+)

(limited to 'gr-blocks/python')

diff --git a/gr-blocks/python/qa_file_source_sink.py b/gr-blocks/python/qa_file_source_sink.py
index d1d67074d5..2898f760ec 100644
--- a/gr-blocks/python/qa_file_source_sink.py
+++ b/gr-blocks/python/qa_file_source_sink.py
@@ -27,6 +27,7 @@ import os
 class test_file_source_sink(gr_unittest.TestCase):
 
     def setUp (self):
+        os.environ['GR_CONF_CONTROLPORT_ON'] = 'False'
         self.tb = gr.top_block ()
 
     def tearDown (self):
diff --git a/gr-blocks/python/qa_udp_source_sink.py b/gr-blocks/python/qa_udp_source_sink.py
index 6ebbf87afc..bd558b2e25 100644
--- a/gr-blocks/python/qa_udp_source_sink.py
+++ b/gr-blocks/python/qa_udp_source_sink.py
@@ -29,6 +29,7 @@ from threading import Timer
 class test_udp_sink_source(gr_unittest.TestCase):
 
     def setUp(self):
+        os.environ['GR_CONF_CONTROLPORT_ON'] = 'False'
         self.tb_snd = gr.top_block()
         self.tb_rcv = gr.top_block()
 
-- 
cgit v1.2.3