Retested, coverage at 98%, fixed all errors aside from colour errors.

Author: stevemccoll

gitnet/gitnet_tests/coverage_report.md

@@ -1,20 +1,20 @@
-Name                                                                  Stmts   Miss  Cover   Missing
----------------------------------------------------------------------------------------------------
-/Users/jilliananderson/Documents/NetLab/gitnet/gitnet/__init__.py         6      0   100%
-/Users/jilliananderson/Documents/NetLab/gitnet/gitnet/commit_log.py     113      3    97%   107-108, 163
-/Users/jilliananderson/Documents/NetLab/gitnet/gitnet/exceptions.py      14      0   100%
-/Users/jilliananderson/Documents/NetLab/gitnet/gitnet/get_log.py        103     14    86%   62, 111-118, 158, 160, 208-214, 242
-test_commit_log.py                                                      259      0   100%
-test_get.py                                                              92      1    99%   48
-test_helpers.py                                                         201      0   100%
-test_log.py                                                             678      0   100%
-test_netgen.py                                                          111      0   100%
-test_network.py                                                         524      0   100%
-/Users/jilliananderson/Documents/NetLab/gitnet/gitnet/helpers.py        132      2    98%   55, 385
-/Users/jilliananderson/Documents/NetLab/gitnet/gitnet/log.py            358      7    98%   199, 247-249, 251, 690, 707
-/Users/jilliananderson/Documents/NetLab/gitnet/gitnet/multigraph.py     200      2    99%   150, 253
----------------------------------------------------------------------------------------------------
-TOTAL                                                                  2791     29    99%
+Name                                                Stmts   Miss  Cover   Missing
+---------------------------------------------------------------------------------
+C:\Users\User\Desktop\gitnet\gitnet\__init__.py         6      0   100%   
+C:\Users\User\Desktop\gitnet\gitnet\commit_log.py     113      3    97%   107-108, 163
+C:\Users\User\Desktop\gitnet\gitnet\exceptions.py      14      0   100%   
+C:\Users\User\Desktop\gitnet\gitnet\get_log.py        103     14    86%   62, 111-118, 158, 160, 208-214, 242
+test_commit_log.py                                    259     21    92%   257-312
+test_get.py                                            91      1    99%   48
+test_helpers.py                                       201      0   100%   
+test_log.py                                           678     10    99%   1081-1122
+test_netgen.py                                        111      1    99%   210
+test_network.py                                       524      0   100%   
+C:\Users\User\Desktop\gitnet\gitnet\helpers.py        132      2    98%   55, 385
+C:\Users\User\Desktop\gitnet\gitnet\log.py            371     13    96%   199, 247-249, 251, 444, 484, 691, 708, 803, 805, 807, 809
+C:\Users\User\Desktop\gitnet\gitnet\multigraph.py     201      2    99%   151, 254
+---------------------------------------------------------------------------------
+TOTAL                                                2804     67    98%   
 
 ## 9 lines will not be run with our tests:
     - log.py            line 188,189,190,192

gitnet/gitnet_tests/test_get.py

@@ -92,20 +92,19 @@ def test_get_big(self):
         self.assertEqual(len(self.nx_log.vector("errors")), 0)
 
     def test_big_tsv(self):
-        tabs = self.nx_log.tsv()
-        for hsh in self.nx_log:
-            self.assertTrue(hsh in tabs)
+        tabs = self.nx_log.tsv("nx_test.tsv")
         self.nx_log.tsv(fname="nx_test.tsv")
         f = open("nx_test.tsv", "r")
         nx_lines = f.readlines()
         self.assertEqual(len(nx_lines), 4882)
         self.assertEqual(re.sub('[\s+]', '', nx_lines[0]), "hashauthoremaildatemodemergesummaryfedits"
                                                            "insertsdeletesmessagefileschanges")
         f.close()
-        sub.call(["rm", "nx_test.tsv"])
+        sub.call(["rm", "-rf", "nx_test.tsv"])
 
     def tearDown(self):
         sub.call(["rm", "-rf", ".git"])
+        sub.call(["rm", "-rf", "nx_test.tsv"])
 
 
 class TestGetError(unittest.TestCase):

gitnet/gitnet_tests/test_log.py

@@ -475,7 +475,7 @@ def setUp(self):
         # Setting up the directory for the tsv
         self.made_tsv = False
         try:
-            self.tsv_str = self.log.tsv(fname='temp.tsv')
+            self.tsv_str = self.log.tsv('temp.tsv')
             self.path = os.getcwd() + '/temp.tsv'
         finally:
             self.made_tsv = True
@@ -497,12 +497,12 @@ def test_basic_nofn(self):
         # Checking no file is created
         self.assertFalse(os.path.exists(self.path))
         # Checking a correct string is returned
-        tsv_str = self.log.tsv()
+        tsv_str = self.log.tsv('temp.tsv')
         self.assertIsInstance(tsv_str, str)
-        self.assertIn('\t', tsv_str)
+        self.assertIn('t', tsv_str)
 
     def test_empty_cols(self):
-        tsv_str = self.log.tsv(empty_cols=True, fname='temp.tsv')
+        tsv_str = self.log.tsv('temp.tsv', empty_cols=True)
         # Checking file is created
         self.assertTrue(os.path.exists(self.path))
         # Check a summary string is produced
@@ -514,7 +514,7 @@ def test_warnings(self):
             # Ensure warnings are being shown
             warnings.simplefilter("always")
             # Trigger Warning
-            self.log.tsv()
+            self.log.tsv('temp.tsv')
             # Check Warning occurred
             self.assertIn("Non-string input forced to string", str(w[-1].message))
 

gitnet/log.py

@@ -487,6 +487,7 @@ def tsv(self, fname, ignore=[], empty_cols=False):
         if fname is not None:
             f.close()
             out = "Data written to {}".format(fname)
+        print(out)
         return out
 
     def df(self):