almost all tests passed

rowers/tests/test_emails.py

@@ -32,7 +32,7 @@ workout run
                     """)
         m.save()
         a2 = 'media/mailbox_attachments/colin3.csv'
-        copyfile('rowers/tests/testdata/emails/colin.csv',a2)
+        copy('rowers/tests/testdata/emails/colin.csv',a2)
         a = MessageAttachment(message=m,document=a2[6:])
         a.save()
 
@@ -100,7 +100,7 @@ boattype: 4x
                         """)
             m.save()
             a2 = 'media/mailbox_attachments/'+filename
-            copyfile(u'rowers/tests/testdata/emails/'+filename,a2)
+            copy(u'rowers/tests/testdata/emails/'+filename,a2)
             a = MessageAttachment(message=m,document=a2[6:])
             a.save()
 
@@ -112,7 +112,7 @@ workout water
                     """)
         m.save()
         a2 = 'media/mailbox_attachments/colin2.csv'
-        copyfile('rowers/tests/testdata/emails/colin.csv',a2)
+        copy('rowers/tests/testdata/emails/colin.csv',a2)
         a = MessageAttachment(message=m,document=a2[6:])
         a.save()
 

rowers/tests/test_user.py

@@ -90,7 +90,7 @@ class UserPreferencesTest(TestCase):
         for workout in self.user_workouts:
             try:
                 os.remove(workout.csvfilename)
-            except (IOError, WindowsError):
+            except (IOError, WindowsError,OSError):
                 pass
 
     def test_accountsettings(self):