Merge commit 'v3.3.1' into try-3.3.1

[debian/gnuradio] / gnuradio-core / src / python / gnuradio / gr / qa_skiphead.py

diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_skiphead.py b/gnuradio-core/src/python/gnuradio/gr/qa_skiphead.py
index 4a25f4921a474a74f1ecd55b1516ed955f89f3cf..de2d8fc9532e257d637b72452495c91e46b19e75 100755 (executable)
--- a/gnuradio-core/src/python/gnuradio/gr/qa_skiphead.py
+++ b/gnuradio-core/src/python/gnuradio/gr/qa_skiphead.py
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 #
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2007,2010 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 2, or (at your option)
+# 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,
@@ -25,11 +25,11 @@ from gnuradio import gr, gr_unittest
 class test_skiphead (gr_unittest.TestCase):
 
     def setUp(self):
-        self.fg = gr.flow_graph ()
+        self.tb = gr.top_block ()
         self.src_data = [int(x) for x in range(65536)]
 
     def tearDown(self):
-        self.fg = None
+        self.tb = None
 
     def test_skip_0(self):
         skip_cnt = 0
@@ -37,8 +37,8 @@ class test_skiphead (gr_unittest.TestCase):
         src1 = gr.vector_source_i (self.src_data)
         op = gr.skiphead (gr.sizeof_int, skip_cnt)
         dst1 = gr.vector_sink_i ()
-        self.fg.connect (src1, op, dst1)
-        self.fg.run ()
+        self.tb.connect (src1, op, dst1)
+        self.tb.run ()
         dst_data = dst1.data ()
         self.assertEqual (expected_result, dst_data)
     
@@ -48,8 +48,8 @@ class test_skiphead (gr_unittest.TestCase):
         src1 = gr.vector_source_i (self.src_data)
         op = gr.skiphead (gr.sizeof_int, skip_cnt)
         dst1 = gr.vector_sink_i ()
-        self.fg.connect (src1, op, dst1)
-        self.fg.run ()
+        self.tb.connect (src1, op, dst1)
+        self.tb.run ()
         dst_data = dst1.data ()
         self.assertEqual (expected_result, dst_data)
     
@@ -59,8 +59,8 @@ class test_skiphead (gr_unittest.TestCase):
         src1 = gr.vector_source_i (self.src_data)
         op = gr.skiphead (gr.sizeof_int, skip_cnt)
         dst1 = gr.vector_sink_i ()
-        self.fg.connect (src1, op, dst1)
-        self.fg.run ()
+        self.tb.connect (src1, op, dst1)
+        self.tb.run ()
         dst_data = dst1.data ()
         self.assertEqual (expected_result, dst_data)
     
@@ -70,8 +70,8 @@ class test_skiphead (gr_unittest.TestCase):
         src1 = gr.vector_source_i (self.src_data)
         op = gr.skiphead (gr.sizeof_int, skip_cnt)
         dst1 = gr.vector_sink_i ()
-        self.fg.connect (src1, op, dst1)
-        self.fg.run ()
+        self.tb.connect (src1, op, dst1)
+        self.tb.run ()
         dst_data = dst1.data ()
         self.assertEqual (expected_result, dst_data)
     
@@ -81,8 +81,8 @@ class test_skiphead (gr_unittest.TestCase):
         src1 = gr.vector_source_i (self.src_data)
         op = gr.skiphead (gr.sizeof_int, skip_cnt)
         dst1 = gr.vector_sink_i ()
-        self.fg.connect (src1, op, dst1)
-        self.fg.run ()
+        self.tb.connect (src1, op, dst1)
+        self.tb.run ()
         dst_data = dst1.data ()
         self.assertEqual (expected_result, dst_data)
 
@@ -92,11 +92,11 @@ class test_skiphead (gr_unittest.TestCase):
         src1 = gr.vector_source_i (self.src_data)
         op = gr.skiphead (gr.sizeof_int, skip_cnt)
         dst1 = gr.vector_sink_i ()
-        self.fg.connect (src1, op, dst1)
-        self.fg.run ()
+        self.tb.connect (src1, op, dst1)
+        self.tb.run ()
         dst_data = dst1.data ()
         self.assertEqual (expected_result, dst_data)
     
 
 if __name__ == '__main__':
-    gr_unittest.main ()
+    gr_unittest.run(test_skiphead, "test_skiphead.xml")