diff --git a/.idea/workspace.xml b/.idea/workspace.xml index febcefc..40d2489 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,11 +2,12 @@ - - + - + + + - { - "keyToString": { - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "WebServerToolWindowFactoryState": "false", - "last_opened_file_path": "C:/program_workspace/python/Integration-testing-environment", - "nodejs_package_manager_path": "npm", - "settings.editor.selected.configurable": "com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" + +}]]> @@ -73,14 +74,14 @@ + - - + @@ -492,7 +499,7 @@ - + @@ -520,7 +527,7 @@ - + diff --git a/autocontrol_driver/generate_autocontrol_driver.py b/autocontrol_driver/generate_autocontrol_driver.py index 3702d7f..8aea0b8 100644 --- a/autocontrol_driver/generate_autocontrol_driver.py +++ b/autocontrol_driver/generate_autocontrol_driver.py @@ -1,6 +1,8 @@ from je_auto_control import start_autocontrol_socket_server -if "__main__" == __name__: +try: server = start_autocontrol_socket_server() while not server.close_flag: pass +except Exception as error: + print(repr(error)) diff --git a/autocontrol_driver/generate_autocontrol_driver_win64.exe b/autocontrol_driver/generate_autocontrol_driver_win64.exe deleted file mode 100644 index d7655ef..0000000 Binary files a/autocontrol_driver/generate_autocontrol_driver_win64.exe and /dev/null differ diff --git a/dev_setup.py b/dev_setup.py index 1f81de6..42992eb 100644 --- a/dev_setup.py +++ b/dev_setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="je_auto_control_dev", - version="0.0.36", + version="0.0.38", author="JE-Chen", author_email="zenmailman@gmail.com", description="auto testing", diff --git a/je_auto_control/__init__.py b/je_auto_control/__init__.py index 2cd2098..c44b828 100644 --- a/je_auto_control/__init__.py +++ b/je_auto_control/__init__.py @@ -75,4 +75,4 @@ from je_auto_control.utils.file_process.get_dir_file_list import get_dir_files_as_list from je_auto_control.utils.file_process.create_project_structure import create_template_dir # socket server -from je_auto_control.utils.socket_server.AutoControlSocketServer import start_autocontrol_socket_server +from je_auto_control.utils.socket_server.auto_control_socket_server import start_autocontrol_socket_server diff --git a/je_auto_control/utils/executor/action_executor.py b/je_auto_control/utils/executor/action_executor.py index 8c20d01..4acf3ed 100644 --- a/je_auto_control/utils/executor/action_executor.py +++ b/je_auto_control/utils/executor/action_executor.py @@ -56,9 +56,9 @@ def __init__(self): def _execute_event(self, action: list): event = self.event_dict.get(action[0]) if len(action) == 2: - event(**action[1]) + return event(**action[1]) elif len(action) == 1: - event() + return event() else: raise AutoControlActionException(cant_execute_action_error + " " + str(action)) @@ -80,19 +80,19 @@ def execute_action(self, action_list: [list, dict]) -> dict: raise AutoControlActionNullException(action_is_null_error) except Exception as error: record_action_to_list("execute_action", action_list, repr(error)) - print(repr(error), file=sys.stderr) + print(repr(error), file=sys.stderr, flush=True) for action in action_list: try: event_response = self._execute_event(action) execute_record = "execute: " + str(action) execute_record_dict.update({execute_record: event_response}) except Exception as error: - print(repr(error), file=sys.stderr) - print(action, file=sys.stderr) + print(repr(error), file=sys.stderr, flush=True) + print(action, file=sys.stderr, flush=True) record_action_to_list("execute_action", None, repr(error)) for key, value in execute_record_dict.items(): - print(key) - print(value) + print(key, flush=True) + print(value, flush=True) return execute_record_dict def execute_files(self, execute_files_list: list) -> list: diff --git a/je_auto_control/utils/socket_server/AutoControlSocketServer.py b/je_auto_control/utils/socket_server/auto_control_socket_server.py similarity index 91% rename from je_auto_control/utils/socket_server/AutoControlSocketServer.py rename to je_auto_control/utils/socket_server/auto_control_socket_server.py index 6dc014d..999e108 100644 --- a/je_auto_control/utils/socket_server/AutoControlSocketServer.py +++ b/je_auto_control/utils/socket_server/auto_control_socket_server.py @@ -9,11 +9,11 @@ class TCPServerHandler(socketserver.BaseRequestHandler): def handle(self): command_string = str(self.request.recv(8192).strip(), encoding="utf-8") - print("command is: " + command_string) + print("command is: " + command_string, flush=True) if command_string == "quit_server": self.server.shutdown() self.server.close_flag = True - print("Now quit server") + print("Now quit server", flush=True) else: try: execute_str = json.loads(command_string) diff --git a/setup.py b/setup.py index 3bb7d44..60f2e3d 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="je_auto_control", - version="0.0.103", + version="0.0.104", author="JE-Chen", author_email="zenmailman@gmail.com", description="auto testing", diff --git a/test/unit_test/socket_server_test/socket_server_test.py b/test/unit_test/socket_server_test/socket_server_test.py index 613e6d5..edbaff4 100644 --- a/test/unit_test/socket_server_test/socket_server_test.py +++ b/test/unit_test/socket_server_test/socket_server_test.py @@ -1,4 +1,4 @@ -from je_auto_control.utils.socket_server.AutoControlSocketServer import start_autocontrol_socket_server +from je_auto_control.utils.socket_server.auto_control_socket_server import start_autocontrol_socket_server server = start_autocontrol_socket_server() server.server_close()