From 36537606da2d5c18793ecd40ef8fa17101e51997 Mon Sep 17 00:00:00 2001 From: sabaimran Date: Sat, 1 Jul 2023 20:02:35 -0700 Subject: [PATCH] Update unit test and preserve prior operational ordering in main.py --- src/khoj/main.py | 20 ++++++++++---------- tests/test_cli.py | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/khoj/main.py b/src/khoj/main.py index 1c70bc16..5a0288ee 100644 --- a/src/khoj/main.py +++ b/src/khoj/main.py @@ -64,7 +64,16 @@ def run(): logger.info("🌘 Starting Khoj") - if args.gui: + if not args.gui: + if not state.demo: + # Setup task scheduler + poll_task_scheduler() + + # Start Server + configure_server(args, required=False) + configure_routes(app) + start_server(app, host=args.host, port=args.port, socket=args.socket) + else: logger.warning("🚧 GUI is being deprecated and may not work as expected. Starting...") # Setup GUI gui = QtWidgets.QApplication([]) @@ -113,15 +122,6 @@ def run(): gui.exec() - if not state.demo: - # Setup task scheduler - poll_task_scheduler() - - # Start Server - configure_server(args, required=False) - configure_routes(app) - start_server(app, host=args.host, port=args.port, socket=args.socket) - def sigint_handler(*args): QtWidgets.QApplication.quit() diff --git a/tests/test_cli.py b/tests/test_cli.py index c96e57bd..fa9a991e 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -36,11 +36,11 @@ def test_cli_invalid_config_file_path(): # ---------------------------------------------------------------------------------------------------- def test_cli_config_from_file(): # Act - actual_args = cli(["-c=tests/data/config.yml", "--regenerate", "-vvv"]) + actual_args = cli(["-c=tests/data/config.yml", "--regenerate", "--gui", "-vvv"]) # Assert assert actual_args.config_file == resolve_absolute_path(Path("tests/data/config.yml")) - assert actual_args.gui == False + assert actual_args.gui == True assert actual_args.regenerate == True assert actual_args.config is not None assert actual_args.verbose == 3