From 921c71b7ec5a1ffc06dfad0a040eccaf7a2883ea Mon Sep 17 00:00:00 2001 From: beierlm Date: Wed, 14 Dec 2022 19:27:28 +0100 Subject: [PATCH] Revert "Testing Pabot" This reverts commit 5ea40e756c18c79f398a02b5cd907b5dce0974aa. Reason for revert: The heal tests collide with each other as they reuse the same descriptors. Change-Id: Id5a094d1786fe3fae25119d2c1ceb75134019cf1 Signed-off-by: Mark Beierl Signed-off-by: garciadeblas --- requirements.in | 1 - requirements.txt | 11 ++--------- robot-systest/run_test.sh | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/requirements.in b/requirements.in index b6da487..9dbfc17 100644 --- a/requirements.in +++ b/requirements.in @@ -23,7 +23,6 @@ regex requests robotframework robotframework-jsonlibrary -robotframework-pabot robotframework-requests robotframework-seleniumlibrary robotframework-sshlibrary diff --git a/requirements.txt b/requirements.txt index 47204bb..d2edc30 100644 --- a/requirements.txt +++ b/requirements.txt @@ -128,7 +128,6 @@ jsonpointer==2.3 jsonschema==2.5.1 # via # charm-tools - # robotframework-jsonlibrary # robotframework-jsonvalidator jujubundlelib==0.5.7 # via @@ -336,17 +335,13 @@ robotframework==5.0.1 # -r requirements.in # robotframework-jsonlibrary # robotframework-jsonvalidator - # robotframework-pabot # robotframework-requests # robotframework-seleniumlibrary # robotframework-sshlibrary - # robotframework-stacktrace -robotframework-jsonlibrary==0.5 +robotframework-jsonlibrary==0.4.1 # via -r requirements.in robotframework-jsonvalidator==2.0.0 # via -r requirements.in -robotframework-pabot==2.7.0 - # via -r requirements.in robotframework-pythonlibcore==3.0.0 # via robotframework-seleniumlibrary robotframework-requests==0.9.3 @@ -355,8 +350,6 @@ robotframework-seleniumlibrary==6.0.0 # via -r requirements.in robotframework-sshlibrary==3.8.0 # via -r requirements.in -robotframework-stacktrace==0.4.1 - # via robotframework-pabot robotframework-yamllibrary==0.2.8 # via -r requirements.in ruamel-yaml==0.15.100 @@ -367,7 +360,7 @@ secretstorage==2.3.1 # via # charm-tools # keyring -selenium==4.4.3 +selenium==4.3.0 # via robotframework-seleniumlibrary simplejson==3.17.6 # via diff --git a/robot-systest/run_test.sh b/robot-systest/run_test.sh index 190889c..6792452 100755 --- a/robot-systest/run_test.sh +++ b/robot-systest/run_test.sh @@ -233,7 +233,7 @@ if [[ -z "${TEST}" ]]; then fi if [[ -n "${TEST}" ]]; then - pabot --processes 2 -d ${ROBOT_DEVOPS_FOLDER}/reports -i ${TEST} ${ROBOT_DEVOPS_FOLDER}/testsuite/ + robot -d ${ROBOT_DEVOPS_FOLDER}/reports -i ${TEST} ${ROBOT_DEVOPS_FOLDER}/testsuite/ exit 0 else echo "Wrong test provided" -- 2.25.1