test: run ./xmodule/ tests with CMS settings (#33534)
Currently, ./xmodule/ unit tests are only run with LMS settings. However, ./common/ and ./xmodule/ are run twice: once with LMS settings and once with CMS settings. Just like ./common/ and ./openedx/, the unit tests in ./xmodule/ validate behavior in both LMS and CMS. So, order to fully test ./xmodule/, we should to run its tests with CMS settings too. This will enable us to better validate certain LibraryContentBlocks behaviors being touched by https://github.com/openedx/edx-platform/pull/33263 which can't be expressed under LMS settings. Also in this commit: * refactor: rename the shards to be clear whether they're running under LMS or CMS * docs: correct comments regarding conditions under which codejail's test_cant_do_something_forbidden is skipped. * test: update a unit test which was using the now-deleted library_sourced block to use library_content block instead.
This commit is contained in:
20
.github/workflows/unit-test-shards.json
vendored
20
.github/workflows/unit-test-shards.json
vendored
@@ -78,7 +78,7 @@
|
||||
"lms/tests.py"
|
||||
]
|
||||
},
|
||||
"openedx-1": {
|
||||
"openedx-1-with-lms": {
|
||||
"settings": "lms.envs.test",
|
||||
"paths": [
|
||||
"openedx/core/djangoapps/ace_common/",
|
||||
@@ -116,7 +116,7 @@
|
||||
"openedx/core/djangoapps/external_user_ids/"
|
||||
]
|
||||
},
|
||||
"openedx-2": {
|
||||
"openedx-2-with-lms": {
|
||||
"settings": "lms.envs.test",
|
||||
"paths": [
|
||||
"openedx/core/djangoapps/geoinfo/",
|
||||
@@ -159,7 +159,7 @@
|
||||
"openedx/tests/"
|
||||
]
|
||||
},
|
||||
"openedx-3": {
|
||||
"openedx-1-with-cms": {
|
||||
"settings": "cms.envs.test",
|
||||
"paths": [
|
||||
"openedx/core/djangoapps/ace_common/",
|
||||
@@ -197,7 +197,7 @@
|
||||
"openedx/core/djangoapps/external_user_ids/"
|
||||
]
|
||||
},
|
||||
"openedx-4": {
|
||||
"openedx-2-with-cms": {
|
||||
"settings": "cms.envs.test",
|
||||
"paths": [
|
||||
"openedx/core/djangoapps/content_tagging/",
|
||||
@@ -258,22 +258,28 @@
|
||||
"cms/djangoapps/contentstore/"
|
||||
]
|
||||
},
|
||||
"common-1": {
|
||||
"common-with-lms": {
|
||||
"settings": "lms.envs.test",
|
||||
"paths": [
|
||||
"common/djangoapps/"
|
||||
]
|
||||
},
|
||||
"common-2": {
|
||||
"common-with-cms": {
|
||||
"settings": "cms.envs.test",
|
||||
"paths": [
|
||||
"common/djangoapps/"
|
||||
]
|
||||
},
|
||||
"xmodule-1": {
|
||||
"xmodule-with-lms": {
|
||||
"settings": "lms.envs.test",
|
||||
"paths": [
|
||||
"xmodule/"
|
||||
]
|
||||
},
|
||||
"xmodule-with-cms": {
|
||||
"settings": "cms.envs.test",
|
||||
"paths": [
|
||||
"xmodule/"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
15
.github/workflows/unit-tests-gh-hosted.yml
vendored
15
.github/workflows/unit-tests-gh-hosted.yml
vendored
@@ -26,15 +26,16 @@ jobs:
|
||||
- "lms-4"
|
||||
- "lms-5"
|
||||
- "lms-6"
|
||||
- "openedx-1"
|
||||
- "openedx-2"
|
||||
- "openedx-3"
|
||||
- "openedx-4"
|
||||
- "openedx-1-with-lms"
|
||||
- "openedx-2-with-lms"
|
||||
- "openedx-1-with-cms"
|
||||
- "openedx-2-with-cms"
|
||||
- "cms-1"
|
||||
- "cms-2"
|
||||
- "common-1"
|
||||
- "common-2"
|
||||
- "xmodule-1"
|
||||
- "common-with-lms"
|
||||
- "common-with-cms"
|
||||
- "xmodule-with-lms"
|
||||
- "xmodule-with-cms"
|
||||
name: gh-hosted-python-${{ matrix.python-version }},django-${{ matrix.django-version }},${{ matrix.shard_name }}
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
15
.github/workflows/unit-tests.yml
vendored
15
.github/workflows/unit-tests.yml
vendored
@@ -27,15 +27,16 @@ jobs:
|
||||
- "lms-4"
|
||||
- "lms-5"
|
||||
- "lms-6"
|
||||
- "openedx-1"
|
||||
- "openedx-2"
|
||||
- "openedx-3"
|
||||
- "openedx-4"
|
||||
- "openedx-1-with-lms"
|
||||
- "openedx-2-with-lms"
|
||||
- "openedx-1-with-cms"
|
||||
- "openedx-2-with-cms"
|
||||
- "cms-1"
|
||||
- "cms-2"
|
||||
- "common-1"
|
||||
- "common-2"
|
||||
- "xmodule-1"
|
||||
- "common-with-lms"
|
||||
- "common-with-cms"
|
||||
- "xmodule-with-lms"
|
||||
- "xmodule-with-cms"
|
||||
# We expect Django 4.0 to fail, so don't stop when it fails.
|
||||
continue-on-error: ${{ matrix.django-version == '4.0' }}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user