From 6c91ebef11a0267fd976282973c5bcd81d5be1fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Thu, 30 Nov 2023 15:57:39 +0100 Subject: [PATCH] feat(driver): add squish.ini config file to repo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Creating it by calling `squishserver` is a waste of time. Signed-off-by: Jakub SokoĊ‚owski --- test/e2e/.gitignore | 1 - test/e2e/driver/server.py | 14 +------------- test/e2e/squish.ini | 3 +++ 3 files changed, 4 insertions(+), 14 deletions(-) create mode 100644 test/e2e/squish.ini diff --git a/test/e2e/.gitignore b/test/e2e/.gitignore index aa8591ca44..2d8e833daf 100644 --- a/test/e2e/.gitignore +++ b/test/e2e/.gitignore @@ -3,7 +3,6 @@ configs/_local.py .idea/ .venv/ -/squish_server.ini *.pyc diff --git a/test/e2e/driver/server.py b/test/e2e/driver/server.py index b7d32396dc..e9be59e071 100644 --- a/test/e2e/driver/server.py +++ b/test/e2e/driver/server.py @@ -13,7 +13,7 @@ _logger = logging.getLogger(__name__) class SquishServer: __instance = None path = configs.testpath.SQUISH_DIR / 'bin' / 'squishserver' - config = configs.testpath.ROOT / 'squish_server.ini' + config = configs.testpath.ROOT / 'squish.ini' host = '127.0.0.1' port = None pid = None @@ -53,18 +53,6 @@ class SquishServer: local_system.run( [f'"{cls.path}"', '--configfile', str(cls.config), '--config', action, ' '.join(options)]) - @classmethod - def add_executable_aut(cls, aut_id, app_dir): - cls.configuring('addAUT', [aut_id, f'"{app_dir}"']) - @classmethod def add_attachable_aut(cls, aut_id: str, port: int): cls.configuring('addAttachableAUT', [aut_id, f'localhost:{port}']) - - @classmethod - def set_aut_timeout(cls, value: int = configs.timeouts.PROCESS_TIMEOUT_SEC): - cls.configuring('setAUTTimeout', [str(value)]) - - @classmethod - def set_cursor_animation(cls, value: bool = configs.squish.CURSOR_ANIMATION): - cls.configuring('setCursorAnimation', [str(value)]) diff --git a/test/e2e/squish.ini b/test/e2e/squish.ini new file mode 100644 index 0000000000..ab58444a6a --- /dev/null +++ b/test/e2e/squish.ini @@ -0,0 +1,3 @@ +[General] +AUTTimeout = "10" +CursorAnimation = False