From e6eeb75be7b1aad188ae9c0ce4559e5a97b857d5 Mon Sep 17 00:00:00 2001 From: Rene Date: Fri, 29 Mar 2024 14:24:34 +0100 Subject: [PATCH] fixed RF 7 rerunfailed, due to Variable moved from robot.running.model Signed-off-by: Rene --- src/DataDriver/DataDriver.py | 2 +- src/DataDriver/rerunfailed.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/DataDriver/DataDriver.py b/src/DataDriver/DataDriver.py index 4c6a035..bc2055f 100644 --- a/src/DataDriver/DataDriver.py +++ b/src/DataDriver/DataDriver.py @@ -51,7 +51,7 @@ warn, ) -__version__ = "1.11.0" +__version__ = "1.11.1" class DataDriver: diff --git a/src/DataDriver/rerunfailed.py b/src/DataDriver/rerunfailed.py index 6919a77..10010c3 100644 --- a/src/DataDriver/rerunfailed.py +++ b/src/DataDriver/rerunfailed.py @@ -5,7 +5,10 @@ from pathlib import Path from robot.api import ExecutionResult, ResultVisitor, SuiteVisitor # type: ignore -from robot.running.model import Variable # type: ignore +try: + from robot.running.model import Variable # type: ignore +except ImportError: + from robot.running.resourcemodel import Variable # type: ignore / robotframework>=7.0 class rerunfailed(SuiteVisitor): @@ -23,7 +26,7 @@ def start_suite(self, suite): suite.tests.clear() return if self._suite_is_data_driven(suite): - dynamic_tests = Variable("@{DYNAMICTESTS}", self._failed_tests, suite.source) + dynamic_tests = Variable("${DYNAMICTESTS}", self._failed_tests, suite.source) suite.resource.variables.append(dynamic_tests) else: suite.tests = [