Fix the unit tests.

- Mock stdout.
- Close the replay file properly.
- Make the unit test runnable.
- Add the extra dependencies to setup.py.

Author: tewalds

mpyq.py

@@ -105,6 +105,14 @@ def __init__(self, filename, listfile=True):
         else:
             self.files = None
 
+    def close(self):
+        if self.file:
+            self.file.close()
+        self.file = None
+
+    def __del__(self):
+        self.close()
+
     def read_header(self):
         """Read the header of a MPQ archive."""
 

setup.py

@@ -30,5 +30,9 @@
         'Topic :: Software Development :: Libraries',
         'Topic :: System :: Archiving',
       ],
-      install_requires=['argparse'] if float(sys.version[:3]) < 2.7 else [],
+      install_requires=[
+          'argparse; python_version < "2.7"',
+          'mock; python_version < "3.3"',
+          'six',
+          ]
      )

test/test_mpqarchive.py

@@ -2,9 +2,15 @@
 # coding: utf-8
 
 import os
-import sys
 import unittest
+
+try:
+    from unittest import mock  # Python 3+
+except ImportError:
+    import mock  # Python 2.7
+
 from mpyq import MPQArchive
+import six
 
 TEST_DIR = os.path.realpath(os.path.dirname(__file__)) + '/'
 
@@ -13,6 +19,10 @@ class TestMPQArchive(unittest.TestCase):
     def setUp(self):
         self.archive = MPQArchive(TEST_DIR + 'test.SC2Replay')
 
+    def tearDown(self):
+        self.archive.close()
+        self.archive = None
+
     def test_init_with_file(self):
         self.archive = MPQArchive(open(TEST_DIR + 'test.SC2Replay', 'rb'))
 
@@ -41,9 +51,10 @@ def test_files(self):
                                               b'replay.smartcam.events',
                                               b'replay.sync.events'])
 
-    def test_print_hash_table(self):
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    def test_print_hash_table(self, mock_stdout):
         self.archive.print_hash_table()
-        self.assertEqual(sys.stdout.getvalue(),
+        self.assertEqual(mock_stdout.getvalue(),
                          "MPQ archive hash table\n"
                          "----------------------\n"
                          " Hash A   Hash B  Locl Plat BlockIdx\n"
@@ -65,9 +76,10 @@ def test_print_hash_table(self):
                          "31952289 6A5FFAA3 0000 0000 00000003\n"
                          "\n")
 
-    def test_print_block_table(self):
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    def test_print_block_table(self, mock_stdout):
         self.archive.print_block_table()
-        self.assertEqual(sys.stdout.getvalue(),
+        self.assertEqual(mock_stdout.getvalue(),
                          "MPQ archive block table\n"
                          "-----------------------\n"
                          " Offset  ArchSize RealSize  Flags\n"
@@ -82,3 +94,7 @@ def test_print_block_table(self):
                          "00031DDE      120      164 81000200\n"
                          "00031E56      254      288 81000200\n"
                          "\n")
+
+
+if __name__ == '__main__':
+    unittest.main()