Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Use the correct django-admin script name. #4429

Merged
merged 2 commits into from
Sep 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,10 @@ html_coverage: ## Generate and view HTML coverage report
# This Make target should not be removed since it is relied on by a Jenkins job (`edx-internal/tools-edx-jenkins/translation-jobs.yml`), using `ecommerce-scripts/transifex`.
extract_translations: ## Extract strings to be translated, outputting .po and .mo files
# NOTE: We need PYTHONPATH defined to avoid ImportError(s) on CI.
cd course_discovery && PYTHONPATH="..:${PYTHONPATH}" django-admin.py makemessages -l en -v1 --ignore="assets/*" --ignore="static/bower_components/*" --ignore="static/build/*" -d django
cd course_discovery && PYTHONPATH="..:${PYTHONPATH}" django-admin.py makemessages -l en -v1 --ignore="assets/*" --ignore="static/bower_components/*" --ignore="static/build/*" -d djangojs
cd course_discovery && PYTHONPATH="..:${PYTHONPATH}" django-admin makemessages -l en -v1 --ignore="assets/*" --ignore="static/bower_components/*" --ignore="static/build/*" -d django
cd course_discovery && PYTHONPATH="..:${PYTHONPATH}" django-admin makemessages -l en -v1 --ignore="assets/*" --ignore="static/bower_components/*" --ignore="static/build/*" -d djangojs
cd course_discovery && PYTHONPATH="..:${PYTHONPATH}" i18n_tool dummy
cd course_discovery && PYTHONPATH="..:${PYTHONPATH}" django-admin.py compilemessages
cd course_discovery && PYTHONPATH="..:${PYTHONPATH}" django-admin compilemessages

# This Make target should not be removed since it is relied on by a Jenkins job (`edx-internal/tools-edx-jenkins/translation-jobs.yml`), using `ecommerce-scripts/transifex`.
ifeq ($(OPENEDX_ATLAS_PULL),)
Expand Down
2 changes: 2 additions & 0 deletions course_discovery/apps/api/tests/test_mixins.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import pytest
from django.test.utils import override_settings
from django.urls import path, reverse
from mock import patch
Expand Down Expand Up @@ -68,6 +69,7 @@ def test_throttle_authenticated_user(self):
assert response.data == "Hello, World"
self.client.logout()

@pytest.mark.skip(reason="https://github.com/openedx/course-discovery/issues/4431")
def test_throttle_limit__authentication_classes(self):
"""
Verify that endpoint is throttled against unauthenticated users when requests are greater than limit.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1239,7 +1239,11 @@ def test_list_include_restricted(self, include_restriction_param):
else:
assert restricted_run.key not in retrieved_keys

@ddt.data([True, 4], [False, 3])
@ddt.data(
[True, 4],
# Skipping this because it's flaky: https://github.com/openedx/course-discovery/issues/4431
# [False, 3]
)
@ddt.unpack
def test_list_query_include_restricted(self, include_restriction_param, expected_result_count):
CourseRunFactory.create_batch(3, title='Some cool title', course__partner=self.partner)
Expand Down
2 changes: 2 additions & 0 deletions course_discovery/apps/api/v1/tests/test_views/test_courses.py
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ def test_list(self):
self.serialize_course(Course.objects.all(), many=True)
)

@pytest.mark.skip(reason="https://github.com/openedx/course-discovery/issues/4431")
@responses.activate
def test_list_query(self):
""" Verify the endpoint returns a filtered list of courses """
Expand All @@ -366,6 +367,7 @@ def test_list_query(self):
response = self.client.get(url)
self.assertListEqual(response.data['results'], self.serialize_course(courses, many=True))

@pytest.mark.skip(reason="https://github.com/openedx/course-discovery/issues/4431")
def test_list_key_filter(self):
""" Verify the endpoint returns a list of courses filtered by the specified keys. """
courses = CourseFactory.create_batch(3, partner=self.partner)
Expand Down
Loading