From a92ea1ff2696c031823c95d37777079a3f472408 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 17 Nov 2024 13:45:05 +0100 Subject: [PATCH] nixos/lib/test-driver: remove legacy args handling Scheduled for removal in 24.11, so let's follow through. Added in #291544. (cherry picked from commit 71306e6b36657f3987214611ec863a891334bf5a) (cherry picked from commit 8427b6f6403156ba9802592895e8964f8b70a874) --- nixos/lib/test-driver/test_driver/driver.py | 37 --------------------- 1 file changed, 37 deletions(-) diff --git a/nixos/lib/test-driver/test_driver/driver.py b/nixos/lib/test-driver/test_driver/driver.py index ca778a576f72..eeefe1380bc8 100644 --- a/nixos/lib/test-driver/test_driver/driver.py +++ b/nixos/lib/test-driver/test_driver/driver.py @@ -211,43 +211,6 @@ class Driver: name: str | None = None, keep_vm_state: bool = False, ) -> Machine: - # Legacy args handling - # FIXME: remove after 24.05 - if isinstance(start_command, dict): - if name is not None or keep_vm_state: - raise TypeError( - "Dictionary passed to create_machine must be the only argument" - ) - - args = start_command - start_command = args.pop("startCommand", SENTINEL) - - if start_command is SENTINEL: - raise TypeError( - "Dictionary passed to create_machine must contain startCommand" - ) - - if not isinstance(start_command, str): - raise TypeError( - f"startCommand must be a string, got: {repr(start_command)}" - ) - - name = args.pop("name", None) - keep_vm_state = args.pop("keep_vm_state", False) - - if args: - raise TypeError( - f"Unsupported arguments passed to create_machine: {args}" - ) - - self.logger.warning( - Fore.YELLOW - + Style.BRIGHT - + "WARNING: Using create_machine with a single dictionary argument is deprecated and will be removed in NixOS 24.11" - + Style.RESET_ALL - ) - # End legacy args handling - tmp_dir = get_tmp_dir() cmd = NixStartScript(start_command)