Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #33350 from salman2013/salman/remove-bok-choy

Browse Source 
chore: remove bok-choy settings
This commit is contained in:
Feanil Patel
2023-10-31 11:19:56 -04:00
committed by GitHub
parent 9e65024744 a97845294f
commit 3003abb092
37 changed files with 18 additions and 2079 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/djangoapps/terrain/stubs/lti.py
View File

@@ -13,7 +13,6 @@ not possible to have this LTI multiple times on a single page in LMS.
import base64
import hashlib
import logging
import os
import textwrap
from unittest import mock
from uuid import uuid4
@@ -78,7 +77,7 @@ class StubLtiHandler(StubHttpRequestHandler):
'callback_url': self.post_dict.get('lis_outcome_service_url').replace('https', 'http'),
'sourcedId': self.post_dict.get('lis_result_sourcedid')
}
host = os.environ.get('BOK_CHOY_HOSTNAME', self.server.server_address[0])
host = self.server.server_address[0]
submit_url = f'//{host}:{self.server.server_address[1]}'
content = self._create_content(status_message, submit_url)
self.send_response(200, content)
@@ -296,7 +295,7 @@ class StubLtiHandler(StubHttpRequestHandler):
"""
client_secret = str(self.server.config.get('client_secret', self.DEFAULT_CLIENT_SECRET))
host = os.environ.get('BOK_CHOY_HOSTNAME', '127.0.0.1')
host = '127.0.0.1'
port = self.server.server_address[1]
lti_base = self.DEFAULT_LTI_ADDRESS.format(host=host, port=port)
lti_endpoint = self.server.config.get('lti_endpoint', self.DEFAULT_LTI_ENDPOINT)

11
common/static/common/js/karma.common.conf.js
View File

@@ -281,15 +281,6 @@ function getBaseConfig(config, useRequireJs) {
'framework:custom': ['factory', initFrameworks]
};
if (process.env.hasOwnProperty('BOK_CHOY_HOSTNAME')) {
hostname = process.env.BOK_CHOY_HOSTNAME;
if (hostname === 'edx.devstack.lms') {
port = 19876;
} else {
port = 19877;
}
}
initFrameworks.$inject = ['config.files'];
return {
@@ -385,7 +376,7 @@ function getBaseConfig(config, useRequireJs) {
}
}
},
// Continuous Integration mode
// if true, Karma captures browsers, runs the tests and exits
singleRun: config.singleRun,