diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-06-07 10:08:00 -0400 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-06-07 10:08:00 -0400 |
commit | 997051fc85e6530c63adc9b718343e0615148c43 (patch) | |
tree | 72e9a5f83884fe9babbd147ddc2548b9510fb11d /gr-blocks/python | |
parent | 5ca7c447f21967df18623937c0d3a4951b699ca1 (diff) | |
parent | fb4e968e1785e0b02b82254fddb19e07fda61723 (diff) |
Merge branch 'maint'
Conflicts:
gr-blocks/python/blocks/qa_file_metadata.py
Diffstat (limited to 'gr-blocks/python')
-rw-r--r-- | gr-blocks/python/blocks/qa_file_metadata.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gr-blocks/python/blocks/qa_file_metadata.py b/gr-blocks/python/blocks/qa_file_metadata.py index bf021870b5..a36eb48fc5 100644 --- a/gr-blocks/python/blocks/qa_file_metadata.py +++ b/gr-blocks/python/blocks/qa_file_metadata.py @@ -76,11 +76,11 @@ class test_file_metadata(gr_unittest.TestCase): except RuntimeError: self.assertFalse() - print header info = parse_file_metadata.parse_header(header, False) extra_str = handle.read(info["extra_len"]) - self.assertEquals(len(extra_str) > 0, True) + self.assertEqual(len(extra_str) > 0, True) + handle.close() try: @@ -159,7 +159,9 @@ class test_file_metadata(gr_unittest.TestCase): info = parse_file_metadata.parse_header(header, False) extra_str = handle.read(info["extra_len"]) - self.assertEquals(len(extra_str) > 0, True) + + self.assertEqual(len(extra_str) > 0, True) + handle.close() try: |