Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,389 Commits 1 Branch 0 Tags
00a1db41093db0de7ce23042ecebd4956869f22a
Commit Graph

3711 Commits

Author SHA1 Message Date
Braden MacDonald
1382bf8720 Save user state for Blockstore XBlocks in CSM, clean up CSM a bit (#21630) 
This commit introduces the changes needed for XBlocks in Blockstore to save
their user state into CSM. Before this commit, all student state for Blockstore
blocks was ephemeral (in-process dict store).

Notes:

* The main risk factor of this PR is that it adds non-course keys to the
  course_id field in CSM. If any code (like analytics?) reads course keys
  directly out of CSM and doesn't have graceful handling for key types it
  doesn't recognize, it could cause an issue. With the included changes to
  opaque-keys, calling CourseKey.from_string(...) on these values will raise
  InvalidKeyError since they're not CourseKeys. (But calling
  LearningContextKey.from_string(...) will work for both course and library
  keys.)
* This commit introduces a slight regression for the Studio view of XBlocks in
  Blockstore content libraries: their state is now lost from request to request.
  I have a follow up PR to give them a proper studio-appropriate state store,
  but I want to review it separately so it doesn't hold up this PR and we can
  test this PR on its own.
 2019-09-18 10:27:46 -04:00
Samuel Walladge
eeedc39b3e conditionally run migration on CSMH Extended table 
CSMH_EXTENDED is optional, so this table is not guaranteed to exist.
 2019-09-17 11:00:17 +09:30
Aarif
072f878b90 Merge pull request #21637 from edx/BOM-446 
BOM-446
 2019-09-13 14:40:36 +05:00
Aarif
616ee00437 Merge pull request #21621 from edx/BOM-412 
BOM-412
 2019-09-13 12:01:07 +05:00
Awais Qureshi
1dde3c354a Merge pull request #21642 from edx/awais786/BOM-472 
BOM-472
 2019-09-12 21:30:30 +05:00
Awais Qureshi
dfb00f95b5 BOM-411 
Fixing python3
 2019-09-12 19:12:37 +05:00
Awais Qureshi
fac33c275d BOM-472 
Fixing python3
 2019-09-12 19:08:23 +05:00
aarif
9301ec38f3 python 3 fixes 2019-09-12 17:29:34 +05:00
aarif
dba8a23144 python 3 fixes 
test fixes

changes made as suggested

updated the variable name
 2019-09-12 15:32:19 +05:00
Awais Qureshi
98ec44b56c BOM-404 
Fixing python3
 2019-09-11 12:52:56 +05:00
Feanil Patel
82f8d5c1f1 Merge pull request #21571 from amitvadhel/BOM-156 
BOM-156 | Fixes for response decoding (Python 3.5)
 2019-09-05 15:35:37 -04:00
Aarif
1a886f3d4a Merge pull request #21534 from edx/BOM-143 
BOM-143
 2019-09-05 15:55:02 +05:00
amitvadhel
7983deb0d5 Fixes for response decoding (Python 3.5) 2019-09-05 12:55:36 +03:00
Ayub khan
eb221e8076 BOM-331 
python3 compatibility
 2019-09-05 11:59:09 +05:00
Ayub khan
a372d44b09 BOM-121 
python3 compatibility
 2019-09-04 15:35:15 +05:00
Ayub
8a5d25f9fd Merge pull request #21476 from edx/BOM-104 
BOM-104
 2019-09-04 12:05:00 +05:00
Awais Qureshi
659cdbddb0 Merge pull request #21542 from edx/awais786/BOM-302 
BOM-302
 2019-09-04 11:38:28 +05:00
Ayub khan
9b46bd02fc BOM-104 
Fixed failing unittest
 2019-09-04 11:20:43 +05:00
Brian Mesick
75e38fc4fd DEPR-18 Remove deprecated Notes LMS djangoapp (#21008) 2019-09-03 16:49:58 -04:00
Awais Qureshi
8b0bb0a707 BOM-302 
TypeError: unorderable types: int() <= MagicMock()
 2019-09-03 23:17:11 +05:00
aarif
129cc739e0 python 3 fixes 2019-09-03 16:27:45 +05:00
amitvadhel
19dd19d0e9 BOM-275: Test case fixes for Python 3.5 2019-09-02 23:29:56 +03:00
Awais Qureshi
01a33b98ac Merge pull request #21505 from edx/awais786/BOM-115 
BOM-115
 2019-09-02 14:08:14 +05:00
arbisoft
19ea7c3875 BOM-115 
Fixing python3
 2019-09-02 13:37:16 +05:00
Joseph Mulloy
7e908a8fc2 Merge pull request #21493 from edx/jdmulloy/fake_csm_id_migration 
Add CSM primary key to bigint migration
 2019-08-30 15:13:01 -04:00
Aarif
36066458a4 Merge pull request #21482 from edx/BOM-274 
BOM-274 Python 3 fixes
 2019-08-30 11:28:48 +05:00
Joseph Mulloy
f9e9b72d97 Add CSM primary key to bigint migration 2019-08-29 17:17:16 -04:00
Aarif
4b0f528ca4 Merge pull request #21467 from edx/BOM-191 
BOM-191 Python 3 fixes
 2019-08-29 17:06:39 +05:00
aarif
fb256b53b0 python 3 fixes 2019-08-28 15:38:10 +05:00
Ayub
fb2595e783 Merge pull request #21465 from edx/BOM-117 
BOM-117
 2019-08-28 14:43:33 +05:00
Cory Lee
8eddb822ab Refactor CSME id, CSMH_EXTENDED default true 2019-08-27 16:47:47 -04:00
aarif
a66cf74c5c fixed NoneType and integer comparison issue 2019-08-27 18:41:48 +05:00
Ayub khan
f1dee91f82 BOM-117 
py3 test fix
 2019-08-27 18:15:27 +05:00
Ayub
f0a033e69a Merge pull request #21420 from edx/BOM-297 
BOM-297
 2019-08-26 09:33:54 +05:00
Ayub khan
caa63452da py3 bytes Assertion Error 2019-08-23 14:18:56 +05:00
Ayub khan
2ca9a95c20 Py3 fixed Assertion Error 2019-08-23 14:15:13 +05:00
Ayub khan
67224f401a BOM-90 
Made all tests py3 compatible.
 2019-08-22 13:04:05 +05:00
Ayub
85be57b64a Merge pull request #21397 from edx/BOM-95 
BOM-95
 2019-08-22 12:41:08 +05:00
Ayub khan
8a95a8e520 BOM-95 
assertItemsEqual with six.assertCountEqual
 2019-08-21 17:01:40 +05:00
Feanil Patel
73a146fbbe Revert "assertItemsEqual() moved to assertCountEqual()" 
This reverts commit 3d2617983b.

The change was not quite right because the method six provides needs to
have `self` be passed in as well.  See the docs here:
https://six.readthedocs.io/#unittest-assertions

Reverting for now and we can fix it in smaller chunks later.
 2019-08-20 15:31:20 -04:00
Dave St.Germain
3d2617983b assertItemsEqual() moved to assertCountEqual() 2019-08-19 17:00:17 -04:00
Dave St.Germain
c51db6c92d Must compare with bytes 2019-08-19 16:35:41 -04:00
Dave St.Germain
9d8db8e4ca Convert to utf-8 before JSON decoding 2019-08-19 15:10:56 -04:00
David Ormsbee
9a1385585f Convert response bytes to str before JSON parsing. (#21375) 
Convert response bytes to str before JSON parsing.
 2019-08-19 11:01:55 -04:00
Nimisha Asthagiri
b7019bddff CourseInfoTestCase fixes for "a bytes-like object is required, not 'str'" 2019-08-19 10:54:12 -04:00
adeelehsan
1eda18a317 Merge pull request #21367 from edx/private_to_public_76a13fa 
Mergeback PR from private to public.
 2019-08-19 15:06:30 +05:00
adeelehsan
76a13fae73 Merge pull request #156 from edx/aehsan/prod-349/remove_google_api_key_from_github 
Removed google api key from github
 2019-08-19 14:32:26 +05:00
Ayub
658cd5c62e BOM-70 (#21327) 
* Update Financial Assistance logic

Use the zendesk proxy app instead of the unsupported zendesk library.

* Move to pre-fetching the group IDs.

Rather than making extra requests to zendesk to list all groups and find
a specific group ID. Just make a pre-filled list of group IDs for the
groups we care about.  When a group name is passed in, it is checked
against this list and the ticket is created in the correct group so the
right people can respond to it.
 2019-08-16 13:05:35 -04:00
Feanil Patel
dc078bb5da Create a new SRT file for this test. 
Usingthe shared file with the other tests wolud sometimes cause this
test to fail.  Made this change to make it less flaky.
 2019-08-13 16:33:09 -04:00
Feanil Patel
9d7f0ca46e Get LMS test collection working in python 3. 
This should be all the changes needed to get test collection working in
python 3 for the `lms` folder.
 2019-08-13 16:32:40 -04:00