Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

18841 Commits

Author SHA1 Message Date
Awais Qureshi
6af113c76f Merge pull request #21966 from edx/awais786/BOM-814 
BOM-814
 2019-10-10 10:51:53 +05:00
jinder1s
eceb53c688 encoding str and opening file in rb mode 2019-10-09 16:48:51 -04:00
edX Transifex Bot
f8fc93facf geoip2: update maxmind geolite country database 2019-10-09 20:33:21 +00:00
Manjinder Singh
b8495dd6b7 Merge pull request #21793 from edx/msingh/test_requirejs_path_overrides_fix 
BOM-614: AssertionError: Lists differ Fix 2 and 3
 2019-10-09 11:34:59 -04:00
jinder1s
feb3e5f0a5 calling assertCountEqual 2019-10-09 10:58:23 -04:00
Feanil Patel
5ef86e2c3c Fix video module tests related to transcript conversion. 2019-10-09 09:51:02 -04:00
Manjinder Singh
a315317315 Merge branch 'master' into msingh/python3_test_lti_stub_py 2019-10-09 08:51:15 -04:00
jinder1s
d025657942 review fixes 2019-10-09 08:49:25 -04:00
Awais Qureshi
eee826ca4b BOM-814 
String comparsion within in raw html were causing tests failures in python3.
The function parses the string and converts into dictionary.
 2019-10-09 15:43:18 +05:00
Aarif
a383c7fdb8 Merge pull request #21886 from edx/BOM-867 
Updated the API to properly parse Query parameters to make it compatible with python 3 - BOM-867
 2019-10-09 15:41:05 +05:00
Ayub
ea8a10e9d8 Merge pull request #21953 from edx/BOM-808 
BOM-808 struct is not defined
 2019-10-09 15:02:18 +05:00
Ayub khan
d1eb51bd71 BOM-808 struct is not defined 
python3 list comprehension variables are not accessible after comprehension
 2019-10-09 12:53:12 +05:00
aarif
8e816fc874 Updated the list comparison to work irrespective of order of items 
Updated the dictionary iteration to make it work with both python versions

Updated the order of expected items for list comparison
 2019-10-09 12:28:48 +05:00
Aarif
4c9aa43c2f Merge pull request #21924 from edx/BOM-813 
Updated the comparison operation to fix None comparison with an integer - BOM-813
 2019-10-09 12:07:13 +05:00
Awais Qureshi
a231876493 BOM-799 
\\n\\n was coming inside the html. Clean it.
 2019-10-09 11:45:14 +05:00
Feanil Patel
bbadf48b8e Merge pull request #21960 from edx/feanil/fix_more_cms_tests 
Feanil/fix more cms tests
 2019-10-08 15:48:54 -04:00
Feanil Patel
92e06d52a6 Delete items by their asset_key instead of _id. 
The _id comes back as a dict and it's in the wrong order compared to the
dict stored in mongo.  This results in lookups for deletion failing when
we use the '_id' as the lookup key.

Luckily the delete function also takes the asset_key as a valid key to
delete by so we just use that instead.
 2019-10-08 15:26:52 -04:00
Feanil Patel
9610aab0f8 Fix more cms contentstore tests. 2019-10-08 15:26:52 -04:00
edX cache uploader bot
c4995d91fd Updating Bokchoy testing database cache (#21952) 2019-10-08 10:30:09 -04:00
adeelehsan
8914d982e7 Merge pull request #21723 from edx/aehsan/prod-655/configuration_model_added_for_bulk_unenroll 
Configuration model added for bulk unenroll command
 2019-10-08 13:51:39 +05:00
Ayub
7537283048 Merge pull request #21935 from edx/BOM-capa-random-python3-combatibility 
BOM Project Capa Module Python3 Compatibility
 2019-10-08 11:11:02 +05:00
Feanil Patel
847758a7da Merge pull request #21938 from edx/feanil/fix_contentstore_tests 
Feanil/fix contentstore views tests
 2019-10-07 16:21:42 -04:00
edX cache uploader bot
a9fd1d961f Updating Bokchoy testing database cache (#21934) 2019-10-07 13:55:56 -04:00
Feanil Patel
5a9a5ba918 Catch another place where we were passing in byte data into transcript conversion module. 2019-10-07 13:49:25 -04:00
Feanil Patel
66382961a7 Fix all transcript related tests. 
Treat transcript content as unicode strings and convert them at any edge
where we encounter them.  One decision made here was to not update
edx-val it treats transcripts as byte but is much closer to the actual
files so it makes more sense over there. But within the platform they
are generally passed around as serialized json and so it's much better
for them to be unicode.
 2019-10-07 13:49:25 -04:00
Jeremy Bowman
71e9c85dca Fix capa problem i18n BOM-775 (#21832) 2019-10-07 11:19:49 -04:00
jinder1s
bd479292f7 quality fixes 2019-10-07 10:28:38 -04:00
jinder1s
93e11925ff Removing decoding due to it being done in another place 2019-10-07 10:27:55 -04:00
jinder1s
cb8d2f8a74 removing pdb 2019-10-07 10:27:55 -04:00
jinder1s
11284039a5 unicode sandwich 2019-10-07 10:27:55 -04:00
Ayub khan
bb242c4b22 BOM Project Capa Module Python3 Compatibility 
Python3 RNG produces different results as compared to python2
In capa problems we save seed value and generate random state
using the seed. Python3 random generates a different state as
compared to python2. Thats why using random2 library to make
state genration consistent in both python versions.
 2019-10-07 16:39:47 +05:00
Aarif
9a8f0cee1d Merge pull request #21894 from edx/BOM-802 
Updated the comparison operation to calculate MongoDB's connection version - BOM-802
 2019-10-07 12:22:30 +05:00
Calen Pennington
5734e79b5d Use absolute paths to upload files in more bokchoy tests 2019-10-04 10:10:11 -04:00
Ayub
42ec910e07 Merge pull request #21922 from edx/BOM-788 
BOM-788
 2019-10-04 15:07:36 +05:00
Chris Pappas
69bb6b582b ENT-2310, ENT-1289 | Running make upgrade to bump edx-enterprise to 2… (#21916) 
* ENT-2310, ENT-1289 | Running make upgrade to bump edx-enterprise to 2.0.0 (and 1.11.0)

* Skipping db_migration test for first part of removal of enterprisecustomerentitlements
 2019-10-03 16:55:55 -04:00
Stu Young
31859fb930 remove flaky test (#21871) 2019-10-03 09:57:50 -04:00
adeelehsan
7908808911 Configuration model added for bulk unenroll command 
Users information will be available in model as csvfile

Prod-655
 2019-10-03 16:33:13 +05:00
aarif
af20d0f7d2 Updated the comparison operation to fix None comparison with integer 2019-10-03 15:52:52 +05:00
Ayub khan
277afeb85e BOM-788 
python3 compatibility: etree returns a bytes type string so in py3 we need to decode it
to compare with a unicode string
 2019-10-03 15:26:36 +05:00
edX Transifex Bot
df6f54da9a geoip2: update maxmind geolite country database 2019-10-02 17:03:28 -04:00
Diana Huang
abf77b1ae1 Drop notes tables. 2019-10-02 14:11:15 -04:00
Feanil Patel
cf989502a1 Merge pull request #21830 from edx/jmbowman/BOM-774 
Fix deprecated drag and drop grading BOM-774
 2019-10-02 10:58:10 -04:00
aarif
c7a05ecf77 Updated the comparison operation to properly calculate mongo connection version 
minor changes made to fix quality issues

changes made as suggested

removed unused import statement
 2019-10-02 13:41:19 +05:00
Calen Pennington
62300b922c Merge pull request #21897 from cpennington/absolute-path-bokchoy-uploads 
Use absolute paths to upload files in video tests
 2019-10-01 14:57:06 -04:00
Calen Pennington
8e0f90045a Use absolute paths to upload files in video tests 2019-10-01 13:04:58 -04:00
aarif
69c73ce211 Updated the API to properly parse Query parameters to make it compatible with python 3 2019-10-01 15:28:11 +05:00
Ayub
27aa7e4abf Merge pull request #21806 from edx/BOM-609 
BOM-609
 2019-10-01 12:10:38 +05:00
Ayub khan
b5dc95a30d BOM-609 
python3 compatibility
 2019-10-01 11:33:37 +05:00
Ayub khan
c29b7520a1 BOM-850 
python3 compatibility
 2019-10-01 10:56:00 +05:00
Ayub
2de3667c85 Merge pull request #21804 from edx/BOM-613 
BOM-613
 2019-10-01 10:41:31 +05:00