sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v4.73'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-11-01 21:06:54 +01:00
parent 591e7319e3 fbc8b4c530
commit a9c8e49d5f
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rowers/tests.py
View File

@@ -29,6 +29,8 @@ from rowers.views import error500_view,error404_view,error400_view,error403_view
from dataprep import delete_strokedata from dataprep import delete_strokedata
from redis import StrictRedis
redis_connection = StrictRedis()
@@ -299,6 +301,7 @@ class TestErrorPages(TestCase):
class NewUserRegistrationTest(TestCase): class NewUserRegistrationTest(TestCase):
def setUp(self): def setUp(self):
self.c = Client() self.c = Client()
redis_connection.publish('tasks','KILL')
def test_newuser(self): def test_newuser(self):
form_data = { form_data = {
@@ -323,6 +326,7 @@ class NewUserRegistrationTest(TestCase):
class WorkoutTests(TestCase): class WorkoutTests(TestCase):
def setUp(self): def setUp(self):
redis_connection.publish('tasks','KILL')
u = User.objects.create_user('john', u = User.objects.create_user('john',
'sander@ds.ds', 'sander@ds.ds',
'koeinsloot') 'koeinsloot')
@@ -342,6 +346,7 @@ class WorkoutTests(TestCase):
class C2Tests(TestCase): class C2Tests(TestCase):
def setUp(self): def setUp(self):
redis_connection.publish('tasks','KILL')
self.u = User.objects.create_user('john', self.u = User.objects.create_user('john',
'sander@ds.ds', 'sander@ds.ds',
'koeinsloot') 'koeinsloot')
@@ -359,6 +364,7 @@ class C2Tests(TestCase):
class DataTest(TestCase): class DataTest(TestCase):
def setUp(self): def setUp(self):
redis_connection.publish('tasks','KILL')
u = User.objects.create_user('john', u = User.objects.create_user('john',
'sander@ds.ds', 'sander@ds.ds',
'koeinsloot') 'koeinsloot')
@@ -538,6 +544,7 @@ class DataTest(TestCase):
class ViewTest(TestCase): class ViewTest(TestCase):
def setUp(self): def setUp(self):
redis_connection.publish('tasks','KILL')
self.c = Client() self.c = Client()
self.u = User.objects.create_user('john', self.u = User.objects.create_user('john',
'sander@ds.ds', 'sander@ds.ds',
@@ -1205,6 +1212,7 @@ class ViewTest(TestCase):
class subroutinetests(TestCase): class subroutinetests(TestCase):
def setUp(self): def setUp(self):
redis_connection.publish('tasks','KILL')
u = User.objects.create_user('john', u = User.objects.create_user('john',
'sander@ds.ds', 'sander@ds.ds',
'koeinsloot') 'koeinsloot')
@@ -1229,6 +1237,7 @@ class subroutinetests(TestCase):
class PlotTests(TestCase): class PlotTests(TestCase):
def setUp(self): def setUp(self):
redis_connection.publish('tasks','KILL')
u = User.objects.create_user('john', u = User.objects.create_user('john',
'sander@ds.ds', 'sander@ds.ds',
'koeinsloot') 'koeinsloot')

4
templates/basebase.html
View File

@@ -80,8 +80,8 @@ var current = null;
js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.10&appId=694685920739849"; js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.10&appId=694685920739849";
fjs.parentNode.insertBefore(js, fjs); fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script> }(document, 'script', 'facebook-jssdk'));</script>
<link rel="stylesheet" href="http://webapiv2.navionics.com/dist/webapi/webapi.min.css" > <link rel="stylesheet" href="https://webapiv2.navionics.com/dist/webapi/webapi.min.css" >
<script type="text/javascript" src="http://webapiv2.navionics.com/dist/webapi/webapi.min.no-dep.js"></script> <script type="text/javascript" src="https://webapiv2.navionics.com/dist/webapi/webapi.min.no-dep.js"></script>
<script>window.twttr = (function(d, s, id) { <script>window.twttr = (function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0], var js, fjs = d.getElementsByTagName(s)[0],
t = window.twttr || {}; t = window.twttr || {};