Merge branch 'develop' into feature/opaqueid

rowers/tests/statements.py

@@ -1,13 +1,24 @@
+try:
+    WindowsError
+except NameError:
+    WindowsError = None
+
+try:
+    OSError
+except NameError:
+    OSError = None
+    
 import pytest
 
 pytestmark = pytest.mark.django_db
 
 from bs4 import BeautifulSoup
 import re
-from nose_parameterized import parameterized
+from parameterized import parameterized
 from django.test import TestCase, Client,override_settings, RequestFactory, TransactionTestCase
 
 from django.core.management import call_command
+from django.core.files.uploadedfile import SimpleUploadedFile
 from django.utils.six import StringIO
 from django.test.client import RequestFactory
 from rowers.views import checkworkoutuser,c2_open, multi_compare_view
@@ -30,13 +41,15 @@ from rowers.tasks import handle_makeplot
 from rowers.utils import serialize_list,deserialize_list
 from rowers.utils import NoTokenError
 from rowers.plannedsessions import get_dates_timeperiod
-from shutil import copyfile
+from shutil import copyfile, copy
 from nose.tools import assert_true
 from mock import Mock, patch
 from minimocktest import MockTestCase
 import pandas as pd
 import rowers.c2stuff as c2stuff
 
+from django.core.urlresolvers import reverse, reverse_lazy
+
 import json
 import numpy as np
 
@@ -79,15 +92,19 @@ def get_random_file(filename='rowers/tests/testdata/testdata.csv',name=''):
 
     frm = inspect.stack()[3]
     mod = inspect.getmodule(frm[0])
-    fromstring = 'test_%s_' % mod.__name__
-    
+    try:
+        fromstring = 'test_%s_' % mod.__name__
+    except AttributeError:
+        fromstring = 'none_'
+        
     row = rdata(filename)
     totaldist = row.df['cum_dist'].max()
     totaltime = row.df['TimeStamp (sec)'].max()-row.df['TimeStamp (sec)'].min()
-    totaltime = totaltime+row.df.ix[0,' ElapsedTime (sec)']
+    totaltime = totaltime+row.df.loc[row.df.index[0],' ElapsedTime (sec)']
     
 	
     hours = int(totaltime/3600.)
+
     minutes = int((totaltime - 3600.*hours)/60.)
     seconds = int(totaltime - 3600.*hours - 60.*minutes)
     tenths = int(10*(totaltime - 3600.*hours - 60.*minutes - seconds))
@@ -95,8 +112,8 @@ def get_random_file(filename='rowers/tests/testdata/testdata.csv',name=''):
     duration = "%s:%s:%s.%s" % (hours,minutes,seconds,tenths)
     duration = datetime.time(hour=hours,minute=minutes,second=seconds)
     
-    workoutdate = row.rowdatetime.strftime('%Y-%m-%d')
-    workoutstarttime = row.rowdatetime.strftime('%H:%M:%S')
+    workoutdate = row.rowdatetime.date()
+    workoutstarttime = row.rowdatetime
 
     extension = filename[-3:]
 
@@ -105,7 +122,8 @@ def get_random_file(filename='rowers/tests/testdata/testdata.csv',name=''):
     else:
         newfilename = 'rowers/tests/testdata/temp/'+fromstring+uuid4().hex[:16]+'.'+extension
 
-    copyfile(filename,newfilename)
+    # copyfile(filename,newfilename)
+    copy(filename,newfilename)
 
     thedict = {
         'row':row,
@@ -122,9 +140,10 @@ def get_random_file(filename='rowers/tests/testdata/testdata.csv',name=''):
 class UserFactory(factory.DjangoModelFactory):
     class Meta:
         model = User
+        django_get_or_create = ('username',)
 
-    email = faker.email()
-    username = faker.profile()['username']
+    email = factory.LazyAttribute(lambda _: faker.email())
+    username = factory.LazyAttribute(lambda _: faker.profile()['username'])
 
     first_name = faker.name().split(' ')[0]
     last_name = faker.name().split(' ')[0]
@@ -170,16 +189,27 @@ class SessionFactory(factory.DjangoModelFactory):
 @pytest.fixture(scope="session", autouse=True)
 def cleanup(request):
     def remove_test_files():
-        
-        for filename in os.listdir('media/mailbox_attachments'):
-            path = os.path.join('media/mailbox_attachments/',filename)
-            if not os.path.isdir(path):
-                os.remove(path)
+        try:
+            for filename in os.listdir('media/mailbox_attachments'):
+                path = os.path.join('media/mailbox_attachments/',filename)
+                if not os.path.isdir(path):
+                    try:
+                        os.remove(path)
+                    except OSError:
+                        pass
+        except OSError:
+            pass
 
-        for filename in os.listdir('rowers/tests/testdata/temp'):
-            path = os.path.join('rowers/tests/testdata/temp/',filename)
-            if not os.path.isdir(path):
-                os.remove(path)
+        try:
+            for filename in os.listdir('rowers/tests/testdata/temp'):
+                path = os.path.join('rowers/tests/testdata/temp/',filename)
+                if not os.path.isdir(path):
+                    try:
+                        os.remove(path)
+                    except OSError:
+                        pass
+        except OSError:
+            pass