diff --git a/rowers/runkeeperstuff.py b/rowers/runkeeperstuff.py index 0800c08a..f4a38f10 100644 --- a/rowers/runkeeperstuff.py +++ b/rowers/runkeeperstuff.py @@ -145,8 +145,14 @@ def createrunkeeperworkoutdata(w): except KeyError: haslatlon = 0 + t = t.tolist() + hr = hr.tolist() + d = d.tolist() + # path data if haslatlon: + lat = lat.tolist() + lon = lon.tolist() locdata = [] for e in zip(t,lat,lon): point = {'timestamp':e[0], diff --git a/rowers/tests/test_staticcharts.py b/rowers/tests/test_staticcharts.py index 552c048c..db0b4235 100644 --- a/rowers/tests/test_staticcharts.py +++ b/rowers/tests/test_staticcharts.py @@ -10,6 +10,7 @@ nu = datetime.datetime.now() #@pytest.mark.django_db +@override_settings(TESTING=True) class PlotTests(TestCase): def setUp(self): redis_connection.publish('tasks','KILL') diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index 7d8b5367..764671d1 100644 Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ diff --git a/rowers/utils.py b/rowers/utils.py index 248fe1d7..db40c9cb 100644 --- a/rowers/utils.py +++ b/rowers/utils.py @@ -302,8 +302,7 @@ def myqueue(queue,function,*args,**kwargs): if settings.TESTING: return MockJob() - - if settings.CELERY: + elif settings.CELERY: kwargs['debug'] = True job = function.delay(*args,**kwargs)