Commit a40ab12a by Jeremy Bowman

PLAT-1858 Better capture of deprecation warnings

parent a4fa04ec
...@@ -21,7 +21,6 @@ sessions. Assumes structure: ...@@ -21,7 +21,6 @@ sessions. Assumes structure:
from .common import * from .common import *
import os import os
from path import Path as path from path import Path as path
from warnings import filterwarnings, simplefilter
from uuid import uuid4 from uuid import uuid4
from util.db import NoOpMigrationModules from util.db import NoOpMigrationModules
from openedx.core.lib.derived import derive_settings from openedx.core.lib.derived import derive_settings
...@@ -175,15 +174,6 @@ CACHES = { ...@@ -175,15 +174,6 @@ CACHES = {
}, },
} }
# hide ratelimit warnings while running tests
filterwarnings('ignore', message='No request passed to the backend, unable to rate-limit')
# Ignore deprecation warnings (so we don't clutter Jenkins builds/production)
# https://docs.python.org/2/library/warnings.html#the-warnings-filter
# Change to "default" to see the first instance of each hit
# or "error" to convert all into errors
simplefilter('ignore')
################################# CELERY ###################################### ################################# CELERY ######################################
CELERY_ALWAYS_EAGER = True CELERY_ALWAYS_EAGER = True
......
[pytest] [pytest]
DJANGO_SETTINGS_MODULE = cms.envs.test DJANGO_SETTINGS_MODULE = cms.envs.test
addopts = --nomigrations --reuse-db --durations=20 -p no:randomly addopts = --nomigrations --reuse-db --durations=20 -p no:randomly
# Enable default handling for all warnings, including those that are ignored by default;
# but hide rate-limit warnings, because we deliberately don't throttle test user logins
filterwarnings =
default
ignore:No request passed to the backend, unable to rate-limit.*:UserWarning
norecursedirs = envs norecursedirs = envs
python_classes = python_classes =
python_files = tests.py test_*.py *_tests.py python_files = tests.py test_*.py *_tests.py
...@@ -2437,7 +2437,9 @@ def auto_auth(request): ...@@ -2437,7 +2437,9 @@ def auto_auth(request):
# Log in as the user # Log in as the user
if login_when_done: if login_when_done:
user = authenticate(username=username, password=password) backend = load_backend(NEW_USER_AUTH_BACKEND)
user = backend.authenticate(request=request, username=username, password=password)
user.backend = NEW_USER_AUTH_BACKEND
login(request, user) login(request, user)
create_comments_service_user(user) create_comments_service_user(user)
......
[pytest] [pytest]
DJANGO_SETTINGS_MODULE = openedx.tests.settings DJANGO_SETTINGS_MODULE = openedx.tests.settings
addopts = --nomigrations --reuse-db --durations=20 addopts = --nomigrations --reuse-db --durations=20
# Enable default handling for all warnings, including those that are ignored by default;
# but hide rate-limit warnings, because we deliberately don't throttle test user logins
filterwarnings =
default
ignore:No request passed to the backend, unable to rate-limit.*:UserWarning
norecursedirs = .cache norecursedirs = .cache
python_classes = python_classes =
python_files = tests.py test_*.py tests_*.py *_tests.py __init__.py python_files = tests.py test_*.py tests_*.py *_tests.py __init__.py
[pytest] [pytest]
addopts = -p no:randomly --durations=20 addopts = -p no:randomly --durations=20
# Enable default handling for all warnings, including those that are ignored by default;
# but hide rate-limit warnings, because we deliberately don't throttle test user logins
filterwarnings =
default
ignore:No request passed to the backend, unable to rate-limit.*:UserWarning
norecursedirs = .cache norecursedirs = .cache
...@@ -22,7 +22,6 @@ from .common import * ...@@ -22,7 +22,6 @@ from .common import *
import os import os
from path import Path as path from path import Path as path
from uuid import uuid4 from uuid import uuid4
from warnings import filterwarnings, simplefilter
from util.db import NoOpMigrationModules from util.db import NoOpMigrationModules
from openedx.core.lib.derived import derive_settings from openedx.core.lib.derived import derive_settings
...@@ -231,15 +230,6 @@ CACHES = { ...@@ -231,15 +230,6 @@ CACHES = {
# Dummy secret key for dev # Dummy secret key for dev
SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd' SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
# hide ratelimit warnings while running tests
filterwarnings('ignore', message='No request passed to the backend, unable to rate-limit')
# Ignore deprecation warnings (so we don't clutter Jenkins builds/production)
# https://docs.python.org/2/library/warnings.html#the-warnings-filter
# Change to "default" to see the first instance of each hit
# or "error" to convert all into errors
simplefilter('ignore')
############################# SECURITY SETTINGS ################################ ############################# SECURITY SETTINGS ################################
# Default to advanced security in common.py, so tests can reset here to use # Default to advanced security in common.py, so tests can reset here to use
# a simpler security model # a simpler security model
......
...@@ -58,10 +58,12 @@ INSTALLED_APPS = ( ...@@ -58,10 +58,12 @@ INSTALLED_APPS = (
'djcelery', 'djcelery',
'openedx.core.djangoapps.video_config', 'openedx.core.djangoapps.video_config',
'openedx.core.djangoapps.video_pipeline', 'openedx.core.djangoapps.video_pipeline',
'openedx.core.djangoapps.bookmarks.apps.BookmarksConfig',
'edxval', 'edxval',
'courseware', 'courseware',
'student', 'student',
'certificates.apps.CertificatesConfig', 'certificates.apps.CertificatesConfig',
'openedx.core.djangoapps.user_api',
'course_modes.apps.CourseModesConfig', 'course_modes.apps.CourseModesConfig',
'lms.djangoapps.verify_student.apps.VerifyStudentConfig', 'lms.djangoapps.verify_student.apps.VerifyStudentConfig',
'openedx.core.djangoapps.dark_lang', 'openedx.core.djangoapps.dark_lang',
...@@ -71,6 +73,7 @@ INSTALLED_APPS = ( ...@@ -71,6 +73,7 @@ INSTALLED_APPS = (
'openedx.core.djangoapps.self_paced', 'openedx.core.djangoapps.self_paced',
'milestones', 'milestones',
'celery_utils', 'celery_utils',
'lms.djangoapps.completion.apps.CompletionAppConfig',
) )
LMS_ROOT_URL = 'http://localhost:8000' LMS_ROOT_URL = 'http://localhost:8000'
......
...@@ -11,10 +11,20 @@ import django ...@@ -11,10 +11,20 @@ import django
def expected_redirect_url(relative_url, hostname='testserver'): def expected_redirect_url(relative_url, hostname='testserver'):
""" """
Get the expected redirect URL for the current Django version and the Get the expected redirect URL for the current Django version and the
given relative URL. Django 1.8 and earlier redirect to absolute URLs, given relative URL:
later versions redirect to relative ones.
* Django 1.8 and earlier redirect URLs beginning with a slash to absolute
URLs, later versions redirect to relative ones.
* Django 1.8 and earlier leave URLs without a leading slash alone, later
versions prepend the missing slash.
""" """
if django.VERSION < (1, 9): if django.VERSION < (1, 9):
return 'http://{}{}'.format(hostname, relative_url) if relative_url.startswith('/'):
return 'http://{}{}'.format(hostname, relative_url)
else:
return relative_url
else: else:
return relative_url if relative_url.startswith('/'):
return relative_url
else:
return '/{}'.format(relative_url)
...@@ -131,14 +131,8 @@ case "$TEST_SUITE" in ...@@ -131,14 +131,8 @@ case "$TEST_SUITE" in
"lms-unit") "lms-unit")
case "$SHARD" in case "$SHARD" in
"all") "all"|[1-4]|"noshard")
$TOX paver test_system -s lms --disable_capture $PAVER_ARGS $PARALLEL 2> lms-tests.log $TOX scripts/unit-tests.sh
;;
[1-3])
$TOX paver test_system -s lms --disable_capture --eval-attr="shard==$SHARD" $PAVER_ARGS $PARALLEL 2> lms-tests.$SHARD.log
;;
4|"noshard")
$TOX paver test_system -s lms --disable_capture --eval-attr='not shard' $PAVER_ARGS $PARALLEL 2> lms-tests.4.log
;; ;;
*) *)
# If no shard is specified, rather than running all tests, create an empty xunit file. This is a # If no shard is specified, rather than running all tests, create an empty xunit file. This is a
...@@ -151,12 +145,8 @@ case "$TEST_SUITE" in ...@@ -151,12 +145,8 @@ case "$TEST_SUITE" in
esac esac
;; ;;
"cms-unit") "cms-unit"|"commonlib-unit")
$TOX paver test_system -s cms --disable_capture $PAVER_ARGS 2> cms-tests.log $TOX scripts/unit-tests.sh
;;
"commonlib-unit")
$TOX paver test_lib --disable_capture $PAVER_ARGS 2> common-tests.log
;; ;;
"js-unit") "js-unit")
......
#!/usr/bin/env bash
set -e
###############################################################################
#
# unit-tests.sh
#
# Execute Python unit tests for edx-platform.
#
# This script is typically called from generic-ci-tests.sh, which defines
# these environment variables:
#
# `TEST_SUITE` defines which kind of test to run.
# Possible values are:
#
# - "lms-unit": Run the LMS Python unit tests
# - "cms-unit": Run the CMS Python unit tests
# - "commonlib-unit": Run Python unit tests from the common/lib directory
#
# `SHARD` is a number indicating which subset of the tests to build.
#
# For "lms-unit", the tests are put into shard groups
# using the 'attr' decorator (e.g. "@attr(shard=1)"). Anything with
# the 'shard=n' attribute will run in the nth shard. If there isn't a
# shard explicitly assigned, the test will run in the last shard.
#
# This script is broken out so it can be run by tox and redirect stderr to
# the specified file before tox gets a chance to redirect it to stdout.
#
###############################################################################
PAVER_ARGS="-v"
PARALLEL="--processes=-1"
case "${TEST_SUITE}" in
"lms-unit")
case "$SHARD" in
"all")
paver test_system -s lms --disable_capture ${PAVER_ARGS} ${PARALLEL} 2> lms-tests.log
;;
[1-3])
paver test_system -s lms --disable_capture --eval-attr="shard==$SHARD" ${PAVER_ARGS} ${PARALLEL} 2> lms-tests.${SHARD}.log
;;
4|"noshard")
paver test_system -s lms --disable_capture --eval-attr='not shard' ${PAVER_ARGS} ${PARALLEL} 2> lms-tests.4.log
;;
esac
;;
"cms-unit")
paver test_system -s cms --disable_capture ${PAVER_ARGS} 2> cms-tests.log
;;
"commonlib-unit")
paver test_lib --disable_capture ${PAVER_ARGS} 2> common-tests.log
;;
esac
...@@ -17,6 +17,11 @@ process-timeout=300 ...@@ -17,6 +17,11 @@ process-timeout=300
[tool:pytest] [tool:pytest]
DJANGO_SETTINGS_MODULE = lms.envs.test DJANGO_SETTINGS_MODULE = lms.envs.test
addopts = --nomigrations --reuse-db --durations=20 addopts = --nomigrations --reuse-db --durations=20
# Enable default handling for all warnings, including those that are ignored by default;
# but hide rate-limit warnings, because we deliberately don't throttle test user logins
filterwarnings =
default
ignore:No request passed to the backend, unable to rate-limit.*:UserWarning
norecursedirs = .* *.egg build conf dist node_modules test_root cms/envs lms/envs norecursedirs = .* *.egg build conf dist node_modules test_root cms/envs lms/envs
python_classes = python_classes =
python_files = tests.py test_*.py tests_*.py *_tests.py __init__.py python_files = tests.py test_*.py tests_*.py *_tests.py __init__.py
......
...@@ -42,6 +42,8 @@ passenv = ...@@ -42,6 +42,8 @@ passenv =
SELENIUM_BROWSER SELENIUM_BROWSER
SELENIUM_HOST SELENIUM_HOST
SELENIUM_PORT SELENIUM_PORT
SHARD
TEST_SUITE
deps = deps =
django18: Django>=1.8,<1.9 django18: Django>=1.8,<1.9
django19: Django>=1.9,<1.10 django19: Django>=1.9,<1.10
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment