Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
db2be76a
Unverified
Commit
db2be76a
authored
Dec 06, 2017
by
John Eskew
Committed by
GitHub
Dec 06, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #16799 from edx/jeskew/turn_on_django_deprecation_warnings
Turn on deprecation warnings in Django 1.11
parents
941bc5cf
4bbc3aa3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
4 deletions
+6
-4
pavelib/paver_tests/test_paver_bok_choy_cmds.py
+1
-0
pavelib/utils/test/suites/bokchoy_suite.py
+2
-1
pavelib/utils/test/suites/pytest_suite.py
+2
-2
tox.ini
+1
-1
No files found.
pavelib/paver_tests/test_paver_bok_choy_cmds.py
View file @
db2be76a
...
@@ -41,6 +41,7 @@ class TestPaverBokChoyCmd(unittest.TestCase):
...
@@ -41,6 +41,7 @@ class TestPaverBokChoyCmd(unittest.TestCase):
"SELENIUM_DRIVER_LOG_DIR='{}/test_root/log{}'"
.
format
(
REPO_DIR
,
shard_str
),
"SELENIUM_DRIVER_LOG_DIR='{}/test_root/log{}'"
.
format
(
REPO_DIR
,
shard_str
),
"VERIFY_XSS='{}'"
.
format
(
verify_xss
),
"VERIFY_XSS='{}'"
.
format
(
verify_xss
),
"python"
,
"python"
,
"-Wd"
,
"-m"
,
"-m"
,
"pytest"
,
"pytest"
,
"{}/common/test/acceptance/{}"
.
format
(
REPO_DIR
,
name
),
"{}/common/test/acceptance/{}"
.
format
(
REPO_DIR
,
name
),
...
...
pavelib/utils/test/suites/bokchoy_suite.py
View file @
db2be76a
...
@@ -341,7 +341,8 @@ class BokChoyTestSuite(TestSuite):
...
@@ -341,7 +341,8 @@ class BokChoyTestSuite(TestSuite):
cmd
.
append
(
"--rcfile={}"
.
format
(
self
.
coveragerc
))
cmd
.
append
(
"--rcfile={}"
.
format
(
self
.
coveragerc
))
else
:
else
:
cmd
+=
[
cmd
+=
[
"python"
"python"
,
"-Wd"
,
]
]
cmd
+=
[
cmd
+=
[
"-m"
,
"-m"
,
...
...
pavelib/utils/test/suites/pytest_suite.py
View file @
db2be76a
...
@@ -134,7 +134,7 @@ class SystemTestSuite(PytestSuite):
...
@@ -134,7 +134,7 @@ class SystemTestSuite(PytestSuite):
if
self
.
django_toxenv
:
if
self
.
django_toxenv
:
cmd
=
[
'tox'
,
'-e'
,
self
.
django_toxenv
,
'--'
]
cmd
=
[
'tox'
,
'-e'
,
self
.
django_toxenv
,
'--'
]
else
:
else
:
cmd
=
[
'pytest'
]
cmd
=
[
'pyt
hon'
,
'-Wd'
,
'-m'
,
'pyt
est'
]
cmd
.
extend
([
cmd
.
extend
([
'--ds={}'
.
format
(
'{}.envs.{}'
.
format
(
self
.
root
,
self
.
settings
)),
'--ds={}'
.
format
(
'{}.envs.{}'
.
format
(
self
.
root
,
self
.
settings
)),
"--junitxml={}"
.
format
(
self
.
xunit_report
),
"--junitxml={}"
.
format
(
self
.
xunit_report
),
...
@@ -223,7 +223,7 @@ class LibTestSuite(PytestSuite):
...
@@ -223,7 +223,7 @@ class LibTestSuite(PytestSuite):
if
self
.
django_toxenv
:
if
self
.
django_toxenv
:
cmd
=
[
'tox'
,
'-e'
,
self
.
django_toxenv
,
'--'
]
cmd
=
[
'tox'
,
'-e'
,
self
.
django_toxenv
,
'--'
]
else
:
else
:
cmd
=
[
'pytest'
]
cmd
=
[
'pyt
hon'
,
'-Wd'
,
'-m'
,
'pyt
est'
]
cmd
.
extend
([
cmd
.
extend
([
"-p"
,
"-p"
,
"no:randomly"
,
"no:randomly"
,
...
...
tox.ini
View file @
db2be76a
...
@@ -48,4 +48,4 @@ deps =
...
@@ -48,4 +48,4 @@ deps =
-rrequirements/edx-sandbox/post.txt
-rrequirements/edx-sandbox/post.txt
commands
=
commands
=
pytest
{posargs}
pyt
hon
-Wd
-m
pyt
est
{posargs}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment