tests: move test_rbac to main tests (#58696)
This commit is contained in:
parent
692ca755f0
commit
1516c4d2e1
|
@ -20,9 +20,6 @@ PGPORT=`python3 -c 'import struct; import socket; s=socket.socket(); s.setsockop
|
||||||
sh """
|
sh """
|
||||||
NUMPROCESSES=6 \
|
NUMPROCESSES=6 \
|
||||||
PGPORT=`python3 -c 'import struct; import socket; s=socket.socket(); s.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, struct.pack("ii", 1, 0)); s.bind(("", 0)); print(s.getsockname()[1]); s.close()'` pg_virtualenv -o fsync=off ${env.TMPDIR}/venv/bin/tox -rv"""
|
PGPORT=`python3 -c 'import struct; import socket; s=socket.socket(); s.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, struct.pack("ii", 1, 0)); s.bind(("", 0)); print(s.getsockname()[1]); s.close()'` pg_virtualenv -o fsync=off ${env.TMPDIR}/venv/bin/tox -rv"""
|
||||||
sh """
|
|
||||||
NUMPROCESSES=6 \
|
|
||||||
PGPORT=`python3 -c 'import struct; import socket; s=socket.socket(); s.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, struct.pack("ii", 1, 0)); s.bind(("", 0)); print(s.getsockname()[1]); s.close()'` pg_virtualenv -o fsync=off ${env.TMPDIR}/venv/bin/tox -rv -e py3-buster-rbac"""
|
|
||||||
if (env.JOB_NAME == 'authentic' && env.GIT_BRANCH == 'origin/main') {
|
if (env.JOB_NAME == 'authentic' && env.GIT_BRANCH == 'origin/main') {
|
||||||
sh """
|
sh """
|
||||||
NUMPROCESSES=6 PGPORT=`python3 -c 'import struct; import socket; s=socket.socket(); s.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, struct.pack("ii", 1, 0)); s.bind(("", 0)); print(s.getsockname()[1]); s.close()'` pg_virtualenv -o fsync=off ${env.TMPDIR}/venv/bin/tox -v -e py3-bullseye -- tests/api"""
|
NUMPROCESSES=6 PGPORT=`python3 -c 'import struct; import socket; s=socket.socket(); s.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, struct.pack("ii", 1, 0)); s.bind(("", 0)); print(s.getsockname()[1]); s.close()'` pg_virtualenv -o fsync=off ${env.TMPDIR}/venv/bin/tox -v -e py3-bullseye -- tests/api"""
|
||||||
|
|
|
@ -1,17 +0,0 @@
|
||||||
from django.conf import global_settings
|
|
||||||
|
|
||||||
MIDDLEWA_CLASSES = global_settings.MIDDLEWARE
|
|
||||||
SECRET_KEY = 'whatever'
|
|
||||||
|
|
||||||
DATABASES = {
|
|
||||||
'default': {
|
|
||||||
'ENGINE': 'django.db.backends.postgresql_psycopg2',
|
|
||||||
'NAME': 'django-rbac',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
INSTALLED_APPS = (
|
|
||||||
'django.contrib.auth',
|
|
||||||
'django.contrib.contenttypes',
|
|
||||||
'django_rbac',
|
|
||||||
)
|
|
13
tox.ini
13
tox.ini
|
@ -25,12 +25,10 @@ setenv =
|
||||||
|
|
||||||
NUMPROCESSES={env:NUMPROCESSES:1}
|
NUMPROCESSES={env:NUMPROCESSES:1}
|
||||||
|
|
||||||
!rbac: AUTHENTIC2_SETTINGS_FILE=tests/settings.py
|
AUTHENTIC2_SETTINGS_FILE=tests/settings.py
|
||||||
!rbac: DJANGO_SETTINGS_MODULE=authentic2.settings
|
DJANGO_SETTINGS_MODULE=authentic2.settings
|
||||||
rbac: DJANGO_SETTINGS_MODULE=django_rbac.test_settings
|
|
||||||
|
|
||||||
!rbac: TESTS=tests/
|
TESTS=tests/
|
||||||
rbac: TESTS=tests_rbac/
|
|
||||||
|
|
||||||
DB_ENGINE=django.db.backends.postgresql_psycopg2
|
DB_ENGINE=django.db.backends.postgresql_psycopg2
|
||||||
SETUPTOOLS_USE_DISTUTILS=stdlib
|
SETUPTOOLS_USE_DISTUTILS=stdlib
|
||||||
|
@ -88,7 +86,7 @@ deps =
|
||||||
uwsgidecorators
|
uwsgidecorators
|
||||||
enum34<=1.1.6
|
enum34<=1.1.6
|
||||||
ldaptools>=0.24
|
ldaptools>=0.24
|
||||||
rbac: numpy
|
numpy
|
||||||
django-filter
|
django-filter
|
||||||
buster: djangorestframework>=3.9.2,<3.10
|
buster: djangorestframework>=3.9.2,<3.10
|
||||||
bullseye: djangorestframework>=3.12,<3.13
|
bullseye: djangorestframework>=3.12,<3.13
|
||||||
|
@ -99,8 +97,7 @@ deps =
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
commands =
|
commands =
|
||||||
./getlasso3.sh
|
./getlasso3.sh
|
||||||
rbac: py.test {env:PYTESTOPTIONS:} {env:FAST:} {env:REUSEDB:} {env:COVERAGE:} {env:JUNIT:} {env:SW:} {posargs:{env:TESTS} --numprocesses {env:NUMPROCESSES:1} --random-group}
|
py.test {env:PYTESTOPTIONS:} {env:FAST:} {env:REUSEDB:} {env:COVERAGE:} {env:JUNIT:} {env:SW:} {posargs:{env:TESTS} --numprocesses {env:NUMPROCESSES:1} --random-group}
|
||||||
!rbac: py.test {env:PYTESTOPTIONS:} {env:FAST:} {env:REUSEDB:} {env:COVERAGE:} {env:JUNIT:} {env:SW:} {posargs:{env:TESTS} --numprocesses {env:NUMPROCESSES:1} --random-group}
|
|
||||||
|
|
||||||
[testenv:check-migrations]
|
[testenv:check-migrations]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
|
|
Loading…
Reference in New Issue