Projet

Général

Profil

0002-tests-move-test_rbac-to-main-tests-58696.patch

Valentin Deniaud, 04 octobre 2022 16:34

Télécharger (3,98 ko)

Voir les différences: 

Subject: [PATCH 2/4] tests: move test_rbac to main tests (#58696)


 Jenkinsfile                        |  3 ---
 src/django_rbac/test_settings.py   | 17 -----------------
 {tests_rbac => tests}/test_rbac.py |  0
 tox.ini                            | 13 +++++--------
 4 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 src/django_rbac/test_settings.py
 rename {tests_rbac => tests}/test_rbac.py (100%)
Jenkinsfile
20 20 
                        sh """
21 21 
        NUMPROCESSES=6 \
22 22 
        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"""
23 
                        sh """
24 
        NUMPROCESSES=6 \
25 
        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"""
26 23 
                        if (env.JOB_NAME == 'authentic' && env.GIT_BRANCH == 'origin/main') {
27 24 
                                sh """
28 25 
        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"""
src/django_rbac/test_settings.py
1 
from django.conf import global_settings
2 

  		




  3
  
  
    
MIDDLEWA_CLASSES = global_settings.MIDDLEWARE

  		




  4
  
  
    
SECRET_KEY = 'whatever'

  		




  5
  
  
    

  		




  6
  
  
    
DATABASES = {

  		




  7
  
  
    
    'default': {

  		




  8
  
  
    
        'ENGINE': 'django.db.backends.postgresql_psycopg2',

  		




  9
  
  
    
        'NAME': 'django-rbac',

  		




  10
  
  
    
    }

  		




  11
  
  
    
}

  		




  12
  
  
    

  		




  13
  
  
    
INSTALLED_APPS = (

  		




  14
  
  
    
    'django.contrib.auth',

  		




  15
  
  
    
    'django.contrib.contenttypes',

  		




  16
  
  
    
    'django_rbac',

  		




  17
  
  
    
)

  		












  

    
      tox.ini
    
  





  25
  25
  
    

  		




  26
  26
  
    
  NUMPROCESSES={env:NUMPROCESSES:1}

  		




  27
  27
  
    

  		




  28
  
  
    
  !rbac: AUTHENTIC2_SETTINGS_FILE=tests/settings.py

  		




  29
  
  
    
  !rbac: DJANGO_SETTINGS_MODULE=authentic2.settings

  		




  30
  
  
    
  rbac: DJANGO_SETTINGS_MODULE=django_rbac.test_settings

  		




  
  28
  
    
  AUTHENTIC2_SETTINGS_FILE=tests/settings.py

  		




  
  29
  
    
  DJANGO_SETTINGS_MODULE=authentic2.settings

  		




  31
  30
  
    

  		




  32
  
  
    
  !rbac: TESTS=tests/

  		




  33
  
  
    
  rbac: TESTS=tests_rbac/

  		




  
  31
  
    
  TESTS=tests/

  		




  34
  32
  
    

  		




  35
  33
  
    
  DB_ENGINE=django.db.backends.postgresql_psycopg2

  		




  36
  34
  
    
  SETUPTOOLS_USE_DISTUTILS=stdlib

  		




  ......




  88
  86
  
    
  uwsgidecorators

  		




  89
  87
  
    
  enum34<=1.1.6

  		




  90
  88
  
    
  ldaptools>=0.24

  		




  91
  
  
    
  rbac: numpy

  		




  
  89
  
    
  numpy

  		




  92
  90
  
    
  django-filter

  		




  93
  91
  
    
  buster: djangorestframework>=3.9.2,<3.10

  		




  94
  92
  
    
  bullseye: djangorestframework>=3.12,<3.13

  		




  ......




  99
  97
  
    
usedevelop = True

  		




  100
  98
  
    
commands =

  		




  101
  99
  
    
  ./getlasso3.sh

  		




  102
  
  
    
  rbac: py.test {env:PYTESTOPTIONS:} {env:FAST:} {env:REUSEDB:} {env:COVERAGE:} {env:JUNIT:} {env:SW:} {posargs:{env:TESTS} --numprocesses {env:NUMPROCESSES:1} --random-group}

  		




  103
  
  
    
  !rbac: py.test {env:PYTESTOPTIONS:} {env:FAST:} {env:REUSEDB:} {env:COVERAGE:} {env:JUNIT:} {env:SW:} {posargs:{env:TESTS} --numprocesses {env:NUMPROCESSES:1} --random-group}

  		




  
  100
  
    
  py.test {env:PYTESTOPTIONS:} {env:FAST:} {env:REUSEDB:} {env:COVERAGE:} {env:JUNIT:} {env:SW:} {posargs:{env:TESTS} --numprocesses {env:NUMPROCESSES:1} --random-group}

  		




  104
  101
  
    

  		




  105
  102
  
    
[testenv:check-migrations]

  		




  106
  103
  
    
basepython = python3

  		




  107
  
  
    
-