Merge branch 'develop' into feature/opaqueid

rowers/tests/test_uploads.py

@@ -5,6 +5,7 @@ nu = datetime.datetime.now()
 from rowers.views import add_defaultfavorites
 
 #@pytest.mark.django_db        
+@override_settings(TESTING=True)
 class ViewTest(TestCase):
     def setUp(self):
         redis_connection.publish('tasks','KILL')
@@ -107,7 +108,7 @@ class ViewTest(TestCase):
 	f_to_be_deleted = w.csvfilename
         try:
 	    os.remove(f_to_be_deleted+'.gz')
-        except WindowsError:
+        except (WindowsError,OSError):
             pass
 
 
@@ -165,7 +166,7 @@ class ViewTest(TestCase):
 	f_to_be_deleted = w.csvfilename
         try:
 	    os.remove(f_to_be_deleted+'.gz')
-        except WindowsError:
+        except (WindowsError,OSError):
             pass
 
 	
@@ -203,7 +204,7 @@ class ViewTest(TestCase):
 	f_to_be_deleted = w.csvfilename
         try:
 	    os.remove(f_to_be_deleted+'.gz')
-        except WindowsError:
+        except (WindowsError,OSError):
             pass
 
     @patch('rowers.dataprep.create_engine')
@@ -285,7 +286,7 @@ class ViewTest(TestCase):
 	f_to_be_deleted = w.csvfilename
         try:
 	    os.remove(f_to_be_deleted+'.gz')
-        except WindowsError:
+        except (WindowsError,OSError):
             pass
 
     @patch('rowers.dataprep.create_engine')
@@ -322,7 +323,7 @@ class ViewTest(TestCase):
 	f_to_be_deleted = w.csvfilename
         try:
 	    os.remove(f_to_be_deleted+'.gz')
-        except WindowsError:
+        except (WindowsError,OSError):
             pass
 
     @patch('rowers.dataprep.create_engine')
@@ -359,7 +360,7 @@ class ViewTest(TestCase):
 	f_to_be_deleted = w.csvfilename
         try:
 	    os.remove(f_to_be_deleted+'.gz')
-        except WindowsError:
+        except (WindowsError,OSError):
             pass
 
 
@@ -398,7 +399,7 @@ class ViewTest(TestCase):
 	f_to_be_deleted = w.csvfilename
         try:
 	    os.remove(f_to_be_deleted+'.gz')
-        except WindowsError:
+        except (WindowsError,OSError):
             pass
 
 
@@ -434,7 +435,7 @@ class ViewTest(TestCase):
 	f_to_be_deleted = w.csvfilename
         try:
 	    os.remove(f_to_be_deleted+'.gz')
-        except WindowsError:
+        except (WindowsError,OSError):
             pass
 
 
@@ -471,7 +472,7 @@ class ViewTest(TestCase):
 	f_to_be_deleted = w.csvfilename
         try:
 	    os.remove(f_to_be_deleted+'.gz')
-        except WindowsError:
+        except (WindowsError,OSError):
             pass
 
 
@@ -510,7 +511,7 @@ class ViewTest(TestCase):
 	f_to_be_deleted = w.csvfilename
         try:
 	    os.remove(f_to_be_deleted+'.gz')
-        except WindowsError:
+        except (WindowsError,OSError):
             pass
 
 
@@ -545,7 +546,7 @@ class ViewTest(TestCase):
 	f_to_be_deleted = w.csvfilename
         try:
 	    os.remove(f_to_be_deleted+'.gz')
-        except WindowsError:
+        except (WindowsError,OSError):
             pass
 
 
@@ -578,7 +579,7 @@ class ViewTest(TestCase):
 	f_to_be_deleted = w.csvfilename
         try:
 	    os.remove(f_to_be_deleted+'.gz')
-        except WindowsError:
+        except (WindowsError,OSError):
             pass
 
 
@@ -611,7 +612,7 @@ class ViewTest(TestCase):
 	f_to_be_deleted = w.csvfilename
         try:
 	    os.remove(f_to_be_deleted+'.gz')
-        except WindowsError:
+        except (WindowsError,OSError):
             pass
 
 
@@ -644,7 +645,7 @@ class ViewTest(TestCase):
 	f_to_be_deleted = w.csvfilename
         try:
 	    os.remove(f_to_be_deleted+'.gz')
-        except WindowsError:
+        except (WindowsError,OSError):
             pass
 
 
@@ -678,7 +679,7 @@ class ViewTest(TestCase):
 	f_to_be_deleted = w.csvfilename
 	try:
             os.remove(f_to_be_deleted+'.gz')
-        except WindowsError:
+        except (WindowsError,OSError):
             pass
 
     @patch('rowers.dataprep.create_engine')
@@ -710,7 +711,7 @@ class ViewTest(TestCase):
 	f_to_be_deleted = w.csvfilename
 	try:
             os.remove(f_to_be_deleted+'.gz')
-        except WindowsError:
+        except (WindowsError,OSError):
             pass
 
     @patch('rowers.dataprep.create_engine')
@@ -742,7 +743,7 @@ class ViewTest(TestCase):
 	f_to_be_deleted = w.csvfilename
 	try:
             os.remove(f_to_be_deleted+'.gz')
-        except WindowsError:
+        except (WindowsError,OSError):
             pass
 
     @patch('rowers.dataprep.create_engine')
@@ -774,6 +775,6 @@ class ViewTest(TestCase):
 	f_to_be_deleted = w.csvfilename
 	try:
             os.remove(f_to_be_deleted+'.gz')
-        except WindowsError:
+        except (WindowsError,OSError):
             pass