oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Modify testAction command to use handleRequest instead of directly calling the function

Browse source
This commit is contained in:
shortcutme 2019-08-02 16:14:44 +02:00
parent fa970fa102
commit c5116fb318
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Test/conftest.py
View file

@ -38,7 +38,7 @@ else:
CHROMEDRIVER_PATH = "chromedriver" CHROMEDRIVER_PATH = "chromedriver"
SITE_URL = "http://127.0.0.1:43110" SITE_URL = "http://127.0.0.1:43110"
TEST_DATA_PATH = 'src/Test/testdata' TEST_DATA_PATH = 'src/Test/testdata'
sys.path.insert(0, os.path.abspath(os.path.dirname(__file__) + "/../lib")) # External modules directory sys.path.insert(0, os.path.abspath(os.path.dirname(__file__) + "/../lib")) # External modules directory
sys.path.insert(0, os.path.abspath(os.path.dirname(__file__) + "/..")) # Imports relative to src dir sys.path.insert(0, os.path.abspath(os.path.dirname(__file__) + "/..")) # Imports relative to src dir
@ -335,9 +335,8 @@ def ui_websocket(site, user):
ui_websocket = UiWebsocket(ws_mock, site, None, user, None) ui_websocket = UiWebsocket(ws_mock, site, None, user, None)
def testAction(action, *args, **kwargs): def testAction(action, *args, **kwargs):
func = getattr(ui_websocket, "action%s" % action) ui_websocket.handleRequest({"id": 0, "cmd": action, "params": list(args) if args else kwargs})
func(0, *args, **kwargs) return ui_websocket.ws.getResult()
return ui_websocket.ws.result.get()
ui_websocket.testAction = testAction ui_websocket.testAction = testAction
return ui_websocket return ui_websocket