Ignore style in tests, change import order

This commit is contained in:
Raphael Michel
2017-06-01 13:27:21 +02:00
parent 1261b8670f
commit bf5ea81b40
4 changed files with 8 additions and 8 deletions

View File

@@ -5,7 +5,6 @@ tests:
- virtualenv env - virtualenv env
- source env/bin/activate - source env/bin/activate
- pip install -U pip wheel setuptools - pip install -U pip wheel setuptools
- XDG_CACHE_HOME=/cache bash .travis.sh style
- XDG_CACHE_HOME=/cache bash .travis.sh tests - XDG_CACHE_HOME=/cache bash .travis.sh tests
tags: tags:
- python3 - python3

View File

@@ -2,8 +2,9 @@ import time
from urllib.parse import urlparse from urllib.parse import urlparse
from django.conf import settings from django.conf import settings
from django.contrib.sessions.middleware import \ from django.contrib.sessions.middleware import (
SessionMiddleware as BaseSessionMiddleware SessionMiddleware as BaseSessionMiddleware,
)
from django.core.cache import cache from django.core.cache import cache
from django.core.exceptions import DisallowedHost from django.core.exceptions import DisallowedHost
from django.core.urlresolvers import set_urlconf from django.core.urlresolvers import set_urlconf

View File

@@ -17,8 +17,9 @@ from django.views.generic import TemplateView, View
from pretix.base.models import Checkin, Event, Order, OrderPosition from pretix.base.models import Checkin, Event, Order, OrderPosition
from pretix.control.permissions import EventPermissionRequiredMixin from pretix.control.permissions import EventPermissionRequiredMixin
from pretix.helpers.urls import build_absolute_uri from pretix.helpers.urls import build_absolute_uri
from pretix.multidomain.urlreverse import \ from pretix.multidomain.urlreverse import (
build_absolute_uri as event_absolute_uri build_absolute_uri as event_absolute_uri,
)
logger = logging.getLogger('pretix.plugins.pretixdroid') logger = logging.getLogger('pretix.plugins.pretixdroid')
API_VERSION = 3 API_VERSION = 3

View File

@@ -2,10 +2,9 @@ from django.db import DEFAULT_DB_ALIAS, connections
from django.test.utils import CaptureQueriesContext from django.test.utils import CaptureQueriesContext
# Inspired by /django/test/testcases.py
# but copied over to work without the unit test module
class _AssertNumQueriesContext(CaptureQueriesContext): class _AssertNumQueriesContext(CaptureQueriesContext):
# Inspired by /django/test/testcases.py
# but copied over to work without the unit test module
def __init__(self, num, connection): def __init__(self, num, connection):
self.num = num self.num = num
super(_AssertNumQueriesContext, self).__init__(connection) super(_AssertNumQueriesContext, self).__init__(connection)