From 4fb56737496c6ef8f6529c4ead7f5f553d546c16 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 15 Jan 2019 12:51:42 +0100 Subject: [PATCH] passing all tests now --- .gitignore | 2 ++ rowers/tests/test_admin.py | 22 ++-------------------- rowers/tests/testdata/testdata.csv.gz | Bin 11437 -> 11437 bytes rowers/tests/testdata/testdata.tcx | 2 +- 4 files changed, 5 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 76ae82ca..5d47abd7 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,8 @@ conftest.py # temporary test files /rowers/tests/testdata/temp +/rowers/tests/testdate/testdata.csv.gz +/rowers/tests/testdate/testdata.tcx # Python egg metadata, regenerated from source files by setuptools. *.egg-info diff --git a/rowers/tests/test_admin.py b/rowers/tests/test_admin.py index ec94c415..49adf64a 100644 --- a/rowers/tests/test_admin.py +++ b/rowers/tests/test_admin.py @@ -1,27 +1,9 @@ #from __future__ import print_function -import pytest - -pytestmark = pytest.mark.django_db - -from bs4 import BeautifulSoup -import re -from nose_parameterized import parameterized -from django.test import TestCase, Client,override_settings -from django.core.management import call_command -from django.utils.six import StringIO -from django.test.client import RequestFactory -import datetime - -import json -import numpy as np - - -from redis import StrictRedis -redis_connection = StrictRedis() +from statements import * +nu = datetime.datetime.now() from rowers.models import User,Rower -from statements import * @pytest.mark.django_db class AdminTests(TestCase): diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index 2f7c131cb0fe4ff8af80f24603370177b76e3ee4..b3b0bd05590583e9f4c014f1f2dec18bf8eeccd4 100644 GIT binary patch delta 15 WcmZ1*xi*qbzMF%iVADpn - <Element 'Notes' at 0x150748d0> + <Element 'Notes' at 0x14f48668>