This repository has been archived by the owner on Nov 4, 2024. It is now read-only.
build: add python 3.11 and 3.12 ci checks #4153
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |||||
| Tests for the checkout page. | ||||||
| """ | ||||||
|
|
||||||
| import sys | ||||||
| from datetime import timedelta | ||||||
|
|
||||||
| import ddt | ||||||
|
|
@@ -130,7 +130,21 @@ def _assert_success_checkout_page(self, sku=None): | |||||
|
|
||||||
| response = self.client.get(self.path) | ||||||
| self.assertEqual(response.status_code, 200) | ||||||
| if sys.version_info > (3, 9): | ||||||
| # assertDictContainsSubset is depreciated in python version>3.9 | ||||||
|
There was a problem hiding this comment.
Suggested change
??? |
||||||
| # context.response return ContextList object, belwo statements will convert it to dict | ||||||
|
There was a problem hiding this comment.
Suggested change
?? |
||||||
| # assertLessEqual method is used instead of depreciated assertDictContainsSubset method | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| context = {} | ||||||
|
There was a problem hiding this comment. A comment here to explain why this is needed would be helpful. Plus, see if this can be improved. There are a bit too many if-elses in the test. There was a problem hiding this comment. Will also look for the alternative for the if-else. |
||||||
| for i, ctx in enumerate(response.context): | ||||||
| if isinstance(ctx, dict): | ||||||
| context.update(ctx) | ||||||
| elif hasattr(ctx, '__iter__') and not isinstance(ctx, str): | ||||||
| for item in ctx: | ||||||
| if isinstance(item, dict): | ||||||
| context.update(item) | ||||||
| self.assertLessEqual({'course': self.course}.items(), context.items()) | ||||||
| else: | ||||||
| self.assertDictContainsSubset({'course': self.course}, response.context) | ||||||
|
|
||||||
| self.assertContains( | ||||||
| response, | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
|
|
||
|
|
||
| import sys | ||
| import uuid | ||
|
|
||
| import ddt | ||
|
|
@@ -122,7 +123,10 @@ def test_post_enterprise_customer_user(self, mock_helpers, expected_return): | |
| self.learner.username | ||
| ) | ||
|
|
||
| if sys.version_info > (3, 9): | ||
|
|
||
| self.assertLessEqual(expected_return.items(), response.items()) | ||
| else: | ||
| self.assertDictContainsSubset(expected_return, response) | ||
|
|
||
| @responses.activate | ||
| def test_ecu_needs_consent(self): | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
|
|
||
|
|
||
| import sys | ||
| from decimal import Decimal | ||
| from urllib import parse | ||
|
|
||
|
|
@@ -338,7 +339,10 @@ def test_get_receipt_for_existing_order(self, mock_learner_data): | |
| } | ||
|
|
||
| self.assertEqual(response.status_code, 200) | ||
| if sys.version_info > (3, 9): | ||
| self.assertEqual(response.context_data, response.context_data | context_data) | ||
| else: | ||
| self.assertDictContainsSubset(context_data, response.context_data) | ||
|
|
||
| @patch('ecommerce.extensions.checkout.views.fetch_enterprise_learner_data') | ||
| @responses.activate | ||
|
|
@@ -371,7 +375,10 @@ def test_get_receipt_for_existing_entitlement_order(self, mock_learner_data): | |
| } | ||
|
|
||
| self.assertEqual(response.status_code, 200) | ||
| if sys.version_info > (3, 9): | ||
| self.assertEqual(response.context_data, response.context_data | context_data) | ||
| else: | ||
| self.assertDictContainsSubset(context_data, response.context_data) | ||
|
|
||
| @patch('ecommerce.extensions.checkout.views.fetch_enterprise_learner_data') | ||
| @responses.activate | ||
|
|
@@ -387,7 +394,10 @@ def test_get_receipt_for_existing_order_as_staff_user(self, mock_learner_data): | |
| } | ||
|
|
||
| self.assertEqual(response.status_code, 200) | ||
| if sys.version_info > (3, 9): | ||
| self.assertEqual(response.context_data, response.context_data | context_data) | ||
| else: | ||
| self.assertDictContainsSubset(context_data, response.context_data) | ||
|
|
||
| @patch('ecommerce.extensions.checkout.views.fetch_enterprise_learner_data') | ||
| @responses.activate | ||
|
|
@@ -400,7 +410,10 @@ def test_get_receipt_for_existing_order_user_not_owner(self, mock_learner_data): | |
| context_data = {'order_history_url': self.site.siteconfiguration.build_lms_url('account/settings')} | ||
|
|
||
| self.assertEqual(response.status_code, 404) | ||
| if sys.version_info > (3, 9): | ||
| self.assertEqual(response.context_data, response.context_data | context_data) | ||
| else: | ||
| self.assertDictContainsSubset(context_data, response.context_data) | ||
|
|
||
| @patch('ecommerce.extensions.checkout.views.fetch_enterprise_learner_data') | ||
| @responses.activate | ||
|
|
@@ -456,7 +469,10 @@ def test_dashboard_link_for_course_purchase(self, mock_learner_data): | |
| } | ||
|
|
||
| self.assertEqual(response.status_code, 200) | ||
| if sys.version_info > (3, 9): | ||
| self.assertEqual(response.context_data, response.context_data | context_data) | ||
| else: | ||
| self.assertDictContainsSubset(context_data, response.context_data) | ||
|
|
||
| @patch('ecommerce.extensions.checkout.views.fetch_enterprise_learner_data') | ||
| @responses.activate | ||
|
|
@@ -482,7 +498,10 @@ def test_dashboard_link_for_bundle_purchase(self, mock_learner_data): | |
| } | ||
|
|
||
| self.assertEqual(response.status_code, 200) | ||
| if sys.version_info > (3, 9): | ||
| self.assertEqual(response.context_data, response.context_data | context_data) | ||
| else: | ||
| self.assertDictContainsSubset(context_data, response.context_data) | ||
|
|
||
| @patch('ecommerce.extensions.checkout.views.fetch_enterprise_learner_data') | ||
| @responses.activate | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you can remove this from all the files