Run black on tests (#692)

Author: blueyed

pytest_django/fixtures.py

@@ -364,7 +364,7 @@ def live_server(request):
                 warnings.warn(
                     "Specifying multiple live server ports is not supported "
                     "in Django 1.11. This will be an error in a future "
-                    "pytest-django release.",
+                    "pytest-django release."
                 )
 
     if not addr:

pytest_django_test/app/migrations/0001_initial.py

@@ -9,16 +9,22 @@ class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = [
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(
-            name='Item',
+            name="Item",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True,
-                                        serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=100)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=100)),
             ],
-        ),
+        )
     ]

pytest_django_test/app/views.py

@@ -7,9 +7,9 @@
 
 def admin_required_view(request):
     if request.user.is_staff:
-        return HttpResponse(Template('You are an admin').render(Context()))
-    return HttpResponse(Template('Access denied').render(Context()))
+        return HttpResponse(Template("You are an admin").render(Context()))
+    return HttpResponse(Template("Access denied").render(Context()))
 
 
 def item_count(request):
-    return HttpResponse('Item count: %d' % Item.objects.count())
+    return HttpResponse("Item count: %d" % Item.objects.count())

pytest_django_test/compat.py

@@ -7,6 +7,7 @@
 try:
     from django.conf.urls import patterns
 except ImportError:
+
     def patterns(prefix, *urls):
-        assert prefix == ''
+        assert prefix == ""
         return urls

pytest_django_test/db_helpers.py

@@ -9,26 +9,26 @@
 
 
 # Construct names for the "inner" database used in runpytest tests
-_settings = settings.DATABASES['default']
+_settings = settings.DATABASES["default"]
 
-DB_NAME = _settings['NAME']
-TEST_DB_NAME = _settings['TEST']['NAME']
+DB_NAME = _settings["NAME"]
+TEST_DB_NAME = _settings["TEST"]["NAME"]
 
-if _settings['ENGINE'] == 'django.db.backends.sqlite3' and TEST_DB_NAME is None:
-    TEST_DB_NAME = ':memory:'
+if _settings["ENGINE"] == "django.db.backends.sqlite3" and TEST_DB_NAME is None:
+    TEST_DB_NAME = ":memory:"
 else:
-    DB_NAME += '_inner'
+    DB_NAME += "_inner"
 
     if TEST_DB_NAME is None:
         # No explicit test db name was given, construct a default one
-        TEST_DB_NAME = 'test_{}_inner'.format(DB_NAME)
+        TEST_DB_NAME = "test_{}_inner".format(DB_NAME)
     else:
         # An explicit test db name was given, is that as the base name
-        TEST_DB_NAME = '{}_inner'.format(TEST_DB_NAME)
+        TEST_DB_NAME = "{}_inner".format(TEST_DB_NAME)
 
 
 def get_db_engine():
-    return _settings['ENGINE'].split('.')[-1]
+    return _settings["ENGINE"].split(".")[-1]
 
 
 class CmdResult(object):
@@ -46,121 +46,125 @@ def run_cmd(*args):
 
 
 def run_mysql(*args):
-    user = _settings.get('USER', None)
+    user = _settings.get("USER", None)
     if user:
-        args = ('-u', user) + tuple(args)
-    args = ('mysql',) + tuple(args)
+        args = ("-u", user) + tuple(args)
+    args = ("mysql",) + tuple(args)
     return run_cmd(*args)
 
 
 def skip_if_sqlite_in_memory():
-    if _settings['ENGINE'] == 'django.db.backends.sqlite3' and _settings['TEST']['NAME'] is None:
-        pytest.skip('Do not test db reuse since database does not support it')
+    if (
+        _settings["ENGINE"] == "django.db.backends.sqlite3"
+        and _settings["TEST"]["NAME"] is None
+    ):
+        pytest.skip("Do not test db reuse since database does not support it")
 
 
 def drop_database(name=TEST_DB_NAME, suffix=None):
-    assert bool(name) ^ bool(suffix), 'name and suffix cannot be used together'
+    assert bool(name) ^ bool(suffix), "name and suffix cannot be used together"
 
     if suffix:
-        name = '%s_%s' % (name, suffix)
+        name = "%s_%s" % (name, suffix)
 
-    if get_db_engine() == 'postgresql_psycopg2':
-        r = run_cmd('psql', 'postgres', '-c', 'DROP DATABASE %s' % name)
+    if get_db_engine() == "postgresql_psycopg2":
+        r = run_cmd("psql", "postgres", "-c", "DROP DATABASE %s" % name)
         assert "DROP DATABASE" in force_text(
             r.std_out
         ) or "does not exist" in force_text(r.std_err)
         return
 
-    if get_db_engine() == 'mysql':
-        r = run_mysql('-e', 'DROP DATABASE %s' % name)
+    if get_db_engine() == "mysql":
+        r = run_mysql("-e", "DROP DATABASE %s" % name)
         assert "database doesn't exist" in force_text(r.std_err) or r.status_code == 0
         return
 
-    if get_db_engine() == 'sqlite3':
-        if name == ':memory:':
-            raise AssertionError(
-                'sqlite in-memory database cannot be dropped!')
+    if get_db_engine() == "sqlite3":
+        if name == ":memory:":
+            raise AssertionError("sqlite in-memory database cannot be dropped!")
         if os.path.exists(name):
             os.unlink(name)
         return
 
-    raise AssertionError('%s cannot be tested properly!' % get_db_engine())
+    raise AssertionError("%s cannot be tested properly!" % get_db_engine())
 
 
 def db_exists(db_suffix=None):
     name = TEST_DB_NAME
 
     if db_suffix:
-        name = '%s_%s' % (name, db_suffix)
+        name = "%s_%s" % (name, db_suffix)
 
-    if get_db_engine() == 'postgresql_psycopg2':
-        r = run_cmd('psql', name, '-c', 'SELECT 1')
+    if get_db_engine() == "postgresql_psycopg2":
+        r = run_cmd("psql", name, "-c", "SELECT 1")
         return r.status_code == 0
 
-    if get_db_engine() == 'mysql':
-        r = run_mysql(name, '-e', 'SELECT 1')
+    if get_db_engine() == "mysql":
+        r = run_mysql(name, "-e", "SELECT 1")
         return r.status_code == 0
 
-    if get_db_engine() == 'sqlite3':
-        if TEST_DB_NAME == ':memory:':
+    if get_db_engine() == "sqlite3":
+        if TEST_DB_NAME == ":memory:":
             raise AssertionError(
-                'sqlite in-memory database cannot be checked for existence!')
+                "sqlite in-memory database cannot be checked for existence!"
+            )
         return os.path.exists(name)
 
-    raise AssertionError('%s cannot be tested properly!' % get_db_engine())
+    raise AssertionError("%s cannot be tested properly!" % get_db_engine())
 
 
 def mark_database():
-    if get_db_engine() == 'postgresql_psycopg2':
-        r = run_cmd('psql', TEST_DB_NAME, '-c', 'CREATE TABLE mark_table();')
+    if get_db_engine() == "postgresql_psycopg2":
+        r = run_cmd("psql", TEST_DB_NAME, "-c", "CREATE TABLE mark_table();")
         assert r.status_code == 0
         return
 
-    if get_db_engine() == 'mysql':
-        r = run_mysql(TEST_DB_NAME, '-e', 'CREATE TABLE mark_table(kaka int);')
+    if get_db_engine() == "mysql":
+        r = run_mysql(TEST_DB_NAME, "-e", "CREATE TABLE mark_table(kaka int);")
         assert r.status_code == 0
         return
 
-    if get_db_engine() == 'sqlite3':
-        if TEST_DB_NAME == ':memory:':
-            raise AssertionError('sqlite in-memory database cannot be marked!')
+    if get_db_engine() == "sqlite3":
+        if TEST_DB_NAME == ":memory:":
+            raise AssertionError("sqlite in-memory database cannot be marked!")
 
         conn = sqlite3.connect(TEST_DB_NAME)
         try:
             with conn:
-                conn.execute('CREATE TABLE mark_table(kaka int);')
+                conn.execute("CREATE TABLE mark_table(kaka int);")
         finally:  # Close the DB even if an error is raised
             conn.close()
         return
 
-    raise AssertionError('%s cannot be tested properly!' % get_db_engine())
+    raise AssertionError("%s cannot be tested properly!" % get_db_engine())
 
 
 def mark_exists():
-    if get_db_engine() == 'postgresql_psycopg2':
-        r = run_cmd('psql', TEST_DB_NAME, '-c', 'SELECT 1 FROM mark_table')
+    if get_db_engine() == "postgresql_psycopg2":
+        r = run_cmd("psql", TEST_DB_NAME, "-c", "SELECT 1 FROM mark_table")
 
         # When something pops out on std_out, we are good
         return bool(r.std_out)
 
-    if get_db_engine() == 'mysql':
-        r = run_mysql(TEST_DB_NAME, '-e', 'SELECT 1 FROM mark_table')
+    if get_db_engine() == "mysql":
+        r = run_mysql(TEST_DB_NAME, "-e", "SELECT 1 FROM mark_table")
 
         return r.status_code == 0
 
-    if get_db_engine() == 'sqlite3':
-        if TEST_DB_NAME == ':memory:':
+    if get_db_engine() == "sqlite3":
+        if TEST_DB_NAME == ":memory:":
             raise AssertionError(
-                'sqlite in-memory database cannot be checked for mark!')
+                "sqlite in-memory database cannot be checked for mark!"
+            )
 
         conn = sqlite3.connect(TEST_DB_NAME)
         try:
             with conn:
-                conn.execute('SELECT 1 FROM mark_table')
+                conn.execute("SELECT 1 FROM mark_table")
                 return True
         except sqlite3.OperationalError:
             return False
         finally:  # Close the DB even if an error is raised
             conn.close()
 
-    raise AssertionError('%s cannot be tested properly!' % get_db_engine())
+    raise AssertionError("%s cannot be tested properly!" % get_db_engine())

pytest_django_test/settings_base.py

@@ -2,33 +2,33 @@
 
 import django
 
-ROOT_URLCONF = 'pytest_django_test.urls'
+ROOT_URLCONF = "pytest_django_test.urls"
 INSTALLED_APPS = [
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'pytest_django_test.app',
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.sessions",
+    "django.contrib.sites",
+    "pytest_django_test.app",
 ]
 
-STATIC_URL = '/static/'
-SECRET_KEY = 'foobar'
+STATIC_URL = "/static/"
+SECRET_KEY = "foobar"
 
 # Used to construct unique test database names to allow detox to run multiple
 # versions at the same time
-uid = os.getenv('UID', '')
+uid = os.getenv("UID", "")
 
 if uid:
-    db_suffix = '_%s' % uid
+    db_suffix = "_%s" % uid
 else:
-    db_suffix = ''
+    db_suffix = ""
 
 MIDDLEWARE = [
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.middleware.common.CommonMiddleware",
+    "django.middleware.csrf.CsrfViewMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",
 ]
 
 if django.VERSION < (1, 10):
@@ -37,9 +37,9 @@
 
 TEMPLATES = [
     {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
-        'APP_DIRS': True,
-        'OPTIONS': {},
-    },
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "DIRS": [],
+        "APP_DIRS": True,
+        "OPTIONS": {},
+    }
 ]

pytest_django_test/settings_mysql_innodb.py

@@ -1,13 +1,11 @@
 from .settings_base import *  # noqa
 
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.mysql',
-        'NAME': 'pytest_django' + db_suffix,  # noqa
-        'HOST': 'localhost',
-        'USER': 'root',
-        'OPTIONS': {
-            'init_command': 'SET storage_engine=InnoDB'
-        }
-    },
+    "default": {
+        "ENGINE": "django.db.backends.mysql",
+        "NAME": "pytest_django" + db_suffix,  # noqa
+        "HOST": "localhost",
+        "USER": "root",
+        "OPTIONS": {"init_command": "SET storage_engine=InnoDB"},
+    }
 }

pytest_django_test/settings_mysql_myisam.py

@@ -1,13 +1,11 @@
 from pytest_django_test.settings_base import *  # noqa
 
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.mysql',
-        'NAME': 'pytest_django' + db_suffix,  # noqa
-        'HOST': 'localhost',
-        'USER': 'root',
-        'OPTIONS': {
-            'init_command': 'SET storage_engine=MyISAM'
-        }
-    },
+    "default": {
+        "ENGINE": "django.db.backends.mysql",
+        "NAME": "pytest_django" + db_suffix,  # noqa
+        "HOST": "localhost",
+        "USER": "root",
+        "OPTIONS": {"init_command": "SET storage_engine=MyISAM"},
+    }
 }

pytest_django_test/settings_postgres.py

@@ -3,16 +3,17 @@
 # PyPy compatibility
 try:
     from psycopg2ct import compat
+
     compat.register()
 except ImportError:
     pass
 
 
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'pytest_django' + db_suffix,  # noqa
-        'HOST': 'localhost',
-        'USER': '',
-    },
+    "default": {
+        "ENGINE": "django.db.backends.postgresql_psycopg2",
+        "NAME": "pytest_django" + db_suffix,  # noqa
+        "HOST": "localhost",
+        "USER": "",
+    }
 }