Fix a couple of tests that are failing in my environment

.gitignore

@@ -114,4 +114,6 @@ ENV/
 !/sphinx/developerdoc.rst
 !/sphinx/modules.rst
 !/sphinx/quickstartdoc.rst
-!/sphinx/userdoc.rst
+!/sphinx/userdoc.rst
+
+.vscode

aodncore/pipeline/db.py

@@ -1,4 +1,3 @@
-import csv
 import psycopg2
 from psycopg2 import sql, extras
 import yaml

aodncore/util/fileops.py

@@ -289,7 +289,7 @@ def mkdir_p(path, mode=0o755):
 
 def rm_f(path):
     """Remove a file, ignoring "file not found" errors (analogous to shell command 'rm -f')
-    
+
     :param path: path to file being deleted
     :return: None
     """

test_aodncore/pipeline/test_db.py

@@ -40,7 +40,6 @@ def setUpClass(cls):
         cls.bad_params = cls.params.copy()
         cls.bad_params['password'] = 'not_a_real_password'
 
-
     @classmethod
     def tearDownClass(cls):
         # Cleanup and stop the postgresql container
@@ -100,6 +99,7 @@ def test_roll_back(self):
         self.assertEqual(0, count)
 
     def test_commit(self):
+        self.drop_table(GOOD_TABLE_DEFN['name'])
         with DatabaseInteractions(config=self.params, schema_base_path=TESTDATA_DIR, logger=self.test_logger) as db:
             db.create_table_from_yaml_file(GOOD_TABLE_DEFN)
 

test_aodncore/util/test_fileops.py

@@ -211,7 +211,8 @@ def test_rm_f(self):
         rm_f(temp_file)
         self.assertFalse(os.path.exists(temp_file))
 
-        with self.assertRaisesRegex(OSError, r'\[Errno 21\].*'):
+        # [Errno 1] or [Errno 21] depeding on the OS...
+        with self.assertRaises(OSError):
             rm_f(temp_dir)
 
     def test_rm_r(self):