Projet

Général

Profil

0007-run-tests-against-django-2.2-49283.patch

Emmanuel Cazenave, 12 janvier 2021 17:12

Télécharger (5,59 ko)

Voir les différences: 

Subject: [PATCH 7/7] run tests against django 2.2 (#49283)


 Jenkinsfile | 10 +++++-----
 setup.py    |  4 ++--
 tox.ini     | 20 ++++++++++++--------
 3 files changed, 19 insertions(+), 15 deletions(-)
Jenkinsfile
14 14 
                        utils = new Utils()
15 15 
                        utils.publish_coverage('coverage-*.xml')
16 16 
                        utils.publish_coverage_native(
17 
                            'index.html', 'htmlcov-py3-coverage-authentic', 'Coverage authentic tests')
17 
                            'index.html', 'htmlcov-py3-django22-coverage-authentic', 'Coverage authentic tests')
18 18 
                        utils.publish_coverage_native(
19 
                            'index.html', 'htmlcov-py3-coverage-hobo', 'Coverage hobo tests')
19 
                            'index.html', 'htmlcov-py3-django22-coverage-hobo', 'Coverage hobo tests')
20 20 
                        utils.publish_coverage_native(
21 
                            'index.html', 'htmlcov-py3-coverage-multipublik', 'Coverage multipublik tests')
21 
                            'index.html', 'htmlcov-py3-django22-coverage-multipublik', 'Coverage multipublik tests')
22 22 
                        utils.publish_coverage_native(
23 
                            'index.html', 'htmlcov-py3-coverage-multitenant', 'Coverage multitenant tests')
23 
                            'index.html', 'htmlcov-py3-django22-coverage-multitenant', 'Coverage multitenant tests')
24 24 
                        utils.publish_coverage_native(
25 
                            'index.html', 'htmlcov-py3-coverage-passerelle', 'Coverage passerelle tests')
25 
                            'index.html', 'htmlcov-py3-django22-coverage-passerelle', 'Coverage passerelle tests')
26 26 
                        utils.publish_pylint('pylint.out')
27 27 
                    }
28 28 
                    mergeJunitResults()
setup.py
144 144 
        'Programming Language :: Python',
145 145 
        'Programming Language :: Python :: 2',
146 146 
    ],
147 
    install_requires=['django>=1.11, <1.12',
147 
    install_requires=['django>=1.11, <2.3',
148 148 
        'gadjo',
149 149 
        'celery<4' if sys.version_info < (3,7) else 'celery>=4',
150 150 
        'django-mellon',
151 151 
        'django-tenant-schemas',
152 152 
        'prometheus_client',
153 
        'djangorestframework>=3.1, <3.7',
153 
        'djangorestframework>=3.4',
154 154 
        'dnspython',
155 155 
        'lxml',
156 156 
    ],
tox.ini
4 4 
# and then run "tox" from this directory.
5 5 
[tox]
6 6 
toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/hobo/{env:BRANCH_NAME:}
7 
envlist = {py2,py3-coverage}-{hobo,multipublik,multitenant,multitenant-oldstylemiddleware,schemas},py3-coverage-{authentic,passerelle}
7 
envlist = py2-django111-{hobo,multipublik,multitenant,multitenant-oldstylemiddleware,schemas},py3-django111-{hobo,multipublik,multitenant,multitenant-oldstylemiddleware,schemas,authentic,passerelle},py3-django22-coverage-{hobo,multipublik,multitenant,multitenant-oldstylemiddleware,schemas,authentic,passerelle}
8 8 

  		




  9
  9
  
    
[testenv]

  		




  10
  10
  
    
usedevelop = True

  		




  ......




  12
  12
  
    
	BRANCH_NAME={env:BRANCH_NAME:}

  		




  13
  13
  
    
	DB_ENGINE=django.db.backends.postgresql_psycopg2

  		




  14
  14
  
    
	SETUPTOOLS_USE_DISTUTILS=stdlib

  		




  
  15
  
    
        JUNIT=--junitxml=junit-{envname}.xml

  		




  15
  16
  
    
	hobo: DJANGO_SETTINGS_MODULE=hobo.settings

  		




  16
  17
  
    
	hobo: HOBO_SETTINGS_FILE=tests/settings.py

  		




  17
  18
  
    
	schemas: DJANGO_SETTINGS_MODULE=hobo.settings

  		




  ......




  26
  27
  
    
	passerelle: DEBIAN_CONFIG_COMMON=debian/debian_config_common.py

  		




  27
  28
  
    
	passerelle: PASSERELLE_SETTINGS_FILE=tests_passerelle/settings.py

  		




  28
  29
  
    
	passerelle: DJANGO_SETTINGS_MODULE=passerelle.settings

  		




  29
  
  
    
	coverage: COVERAGE=--junitxml=junit-{envname}.xml --cov-report xml:coverage-{envname}.xml --cov-report html:htmlcov-{envname} --cov=hobo/ --cov-config .coveragerc

  		




  
  30
  
    
	coverage: COVERAGE=--cov-report xml:coverage-{envname}.xml --cov-report html:htmlcov-{envname} --cov=hobo/ --cov-config .coveragerc

  		




  30
  31
  
    
	fast: NOMIGRATIONS=--nomigrations

  		




  31
  32
  
    
	oldstylemiddleware: OLD_STYLE_MIDDLEWARE=true

  		




  32
  33
  
    
deps:

  		




  
  34
  
    
        django111: django>=1.11,<1.12

  		




  
  35
  
    
        django22: django>=2.2,<2.3

  		




  
  36
  
    
        django111: djangorestframework<3.12.0

  		




  33
  37
  
    
	pytest!=6.0.0

  		




  34
  38
  
    
	pytest-cov

  		




  35
  39
  
    
	pytest-django

  		




  ......




  61
  65
  
    
commands =

  		




  62
  66
  
    
	py2: ./getlasso.sh

  		




  63
  67
  
    
	py3: ./getlasso3.sh

  		




  64
  
  
    
	hobo: py.test {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests/}

  		




  65
  
  
    
	schemas: py.test {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests_schemas/}

  		




  66
  
  
    
	multitenant: py.test {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests_multitenant/}

  		




  67
  
  
    
	multipublik: py.test {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests_multipublik/}

  		




  68
  
  
    
	authentic: py.test {env:FAST:} {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests_authentic/}

  		




  69
  
  
    
	passerelle: py.test {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests_passerelle/}

  		




  
  68
  
    
	hobo: py.test {env:JUNIT:} {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests/}

  		




  
  69
  
    
	schemas: py.test {env:JUNIT:} {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests_schemas/}

  		




  
  70
  
    
	multitenant: py.test {env:JUNIT:} {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests_multitenant/}

  		




  
  71
  
    
	multipublik: py.test {env:JUNIT:} {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests_multipublik/}

  		




  
  72
  
    
	authentic: py.test {env:JUNIT:} {env:FAST:} {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests_authentic/}

  		




  
  73
  
    
	passerelle: py.test {env:JUNIT:} {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests_passerelle/}

  		




  70
  
  
    
-