From 484acc4eabdc19d8c72c8c0724bae76ad975d955 Mon Sep 17 00:00:00 2001
From: Ruben Undheim <ruben.undheim@gmail.com>
Date: Sun, 14 May 2017 09:45:38 +0000
Subject: Address comment in pull request to use "with" with tempfile
---
gr-blocks/python/blocks/qa_file_source_sink.py | 52 +++++++++++++-------------
1 file changed, 25 insertions(+), 27 deletions(-)
(limited to 'gr-blocks/python/blocks/qa_file_source_sink.py')
diff --git a/gr-blocks/python/blocks/qa_file_source_sink.py b/gr-blocks/python/blocks/qa_file_source_sink.py
index 0a5887d442..081f58228f 100644
--- a/gr-blocks/python/blocks/qa_file_source_sink.py
+++ b/gr-blocks/python/blocks/qa_file_source_sink.py
@@ -107,23 +107,22 @@ class test_file_source_sink(gr_unittest.TestCase):
src_data = range(1000)
expected_result = range(1000)
- filename = "tmp.32f"
- src = blocks.vector_source_f(src_data)
- snk = blocks.file_sink(gr.sizeof_float, filename)
- snk.set_unbuffered(True)
-
- src2 = blocks.file_source(gr.sizeof_float, filename)
- src2.set_begin_tag(True)
snk2 = blocks.vector_sink_f()
- self.tb.connect(src, snk)
- self.tb.run()
+ with tempfile.NamedTemporaryFile() as temp:
+ src = blocks.vector_source_f(src_data)
+ snk = blocks.file_sink(gr.sizeof_float, temp.name)
+ snk.set_unbuffered(True)
- self.tb.disconnect(src, snk)
- self.tb.connect(src2, snk2)
- self.tb.run()
+ src2 = blocks.file_source(gr.sizeof_float, temp.name)
+ src2.set_begin_tag(True)
- os.remove(filename)
+ self.tb.connect(src, snk)
+ self.tb.run()
+
+ self.tb.disconnect(src, snk)
+ self.tb.connect(src2, snk2)
+ self.tb.run()
result_data = snk2.data()
self.assertFloatTuplesAlmostEqual(expected_result, result_data)
@@ -134,24 +133,23 @@ class test_file_source_sink(gr_unittest.TestCase):
expected_result = range(1000)
expected_result.extend(range(1000))
- filename = "tmp.32f"
- src = blocks.vector_source_f(src_data)
- snk = blocks.file_sink(gr.sizeof_float, filename)
- snk.set_unbuffered(True)
-
- src2 = blocks.file_source(gr.sizeof_float, filename, True)
- src2.set_begin_tag(True)
- hd = blocks.head(gr.sizeof_float, 2000)
snk2 = blocks.vector_sink_f()
- self.tb.connect(src, snk)
- self.tb.run()
+ with tempfile.NamedTemporaryFile() as temp:
+ src = blocks.vector_source_f(src_data)
+ snk = blocks.file_sink(gr.sizeof_float, temp.name)
+ snk.set_unbuffered(True)
- self.tb.disconnect(src, snk)
- self.tb.connect(src2, hd, snk2)
- self.tb.run()
+ src2 = blocks.file_source(gr.sizeof_float, temp.name, True)
+ src2.set_begin_tag(True)
+ hd = blocks.head(gr.sizeof_float, 2000)
- os.remove(filename)
+ self.tb.connect(src, snk)
+ self.tb.run()
+
+ self.tb.disconnect(src, snk)
+ self.tb.connect(src2, hd, snk2)
+ self.tb.run()
result_data = snk2.data()
self.assertFloatTuplesAlmostEqual(expected_result, result_data)
--
cgit v1.2.3