From e2d70a11d749bdc29b633bf11876780d396ea19d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maarit=20H=C3=A4rk=C3=B6nen?= Date: Thu, 24 Oct 2024 10:47:29 +0300 Subject: [PATCH] Modify version checking MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maarit Härkönen --- Robot-Framework/resources/ssh_keywords.resource | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Robot-Framework/resources/ssh_keywords.resource b/Robot-Framework/resources/ssh_keywords.resource index 668578b..fd595de 100644 --- a/Robot-Framework/resources/ssh_keywords.resource +++ b/Robot-Framework/resources/ssh_keywords.resource @@ -257,9 +257,8 @@ Check file doesn't exist Verify Ghaf Version Format [Documentation] Check that ghaf-version contains version number in the format:"dd.dd" - ${major} ${minor} Get Ghaf Version - Should Match Regexp ${major} ^\\d{2}$ - Should Match Regexp ${minor} ^\\d{2}$ + ${version} Get Ghaf Version + Should Match Regexp ${version} \\d{2}.\\d{2}.?\\d{0,2}\$ Verify Nixos Version Format [Documentation] Check that nixos-version contains version number in the format:"dd.dd", @@ -279,8 +278,7 @@ Get Ghaf Version ${output} ${rc} Execute Command ghaf-version return_rc=True Should Be Equal As Integers ${rc} 0 Couldn't get ghaf version, command return code Log To Console ghaf-version: ${output} - ${major} ${minor} Parse Ghaf Version ${output} - RETURN ${major} ${minor} + RETURN ${output} Get Nixos Version [Documentation] Get version of NixOS, Example: