From b8b6683fb1aff21de4fb348e2de0b9db9d26e286 Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Sat, 7 Oct 2023 10:07:42 +0200 Subject: [PATCH 1/3] cleanup: remove unused p.a.robotframework --- setup.py | 2 +- src/plone/restapi/tests/robot/test.robot | 22 ------------------ src/plone/restapi/tests/test_robot.py.txt | 28 ----------------------- 3 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 src/plone/restapi/tests/robot/test.robot delete mode 100644 src/plone/restapi/tests/test_robot.py.txt diff --git a/setup.py b/setup.py index b4351a8074..f92118d2e4 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ def read(filename): "plone.app.caching", "plone.app.contenttypes", "plone.app.robotframework", - "plone.app.testing [robot] >= 4.2.2", # ROBOT_TEST_LEVEL added + "plone.app.testing", "plone.api", "requests", "mock", diff --git a/src/plone/restapi/tests/robot/test.robot b/src/plone/restapi/tests/robot/test.robot deleted file mode 100644 index 9313a7d5d1..0000000000 --- a/src/plone/restapi/tests/robot/test.robot +++ /dev/null @@ -1,22 +0,0 @@ -*** Settings *** - -Library Selenium2Library timeout=10 implicit_wait=0.5 - -Suite Setup Start browser -Suite Teardown Close All Browsers - -*** Variables *** - -${BROWSER} = firefox - -*** Test Cases *** - -Plone site - [Tags] start - Go to ${PLONE_URL} - Page should contain Plone site - -*** Keywords *** - -Start browser - Open browser ${PLONE_URL} browser=${BROWSER} diff --git a/src/plone/restapi/tests/test_robot.py.txt b/src/plone/restapi/tests/test_robot.py.txt deleted file mode 100644 index ba16dbdef9..0000000000 --- a/src/plone/restapi/tests/test_robot.py.txt +++ /dev/null @@ -1,28 +0,0 @@ -# -*- coding: utf-8 -*- -from plone.app.testing import ROBOT_TEST_LEVEL -from plone.restapi.testing import PLONE_RESTAPI_DX_FUNCTIONAL_TESTING -from plone.testing import layered -import robotsuite -import unittest -import os - - -def test_suite(): - suite = unittest.TestSuite() - current_dir = os.path.abspath(os.path.dirname(__file__)) - robot_dir = os.path.join(current_dir, 'robot') - robot_tests = [ - os.path.join('robot', doc) for doc in - os.listdir(robot_dir) if doc.endswith('.robot') and - doc.startswith('test_') - ] - for robot_test in robot_tests: - robottestsuite = robotsuite.RobotTestSuite(robot_test) - robottestsuite.level = ROBOT_TEST_LEVEL - suite.addTests([ - layered( - robottestsuite, - layer=PLONE_RESTAPI_DX_FUNCTIONAL_TESTING - ), - ]) - return suite From a13a231b005251f30f03df475b24073d8418904d Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Sat, 7 Oct 2023 10:08:37 +0200 Subject: [PATCH 2/3] Add news entry --- news/1720.internal | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 news/1720.internal diff --git a/news/1720.internal b/news/1720.internal new file mode 100644 index 0000000000..1ce1f5bf97 --- /dev/null +++ b/news/1720.internal @@ -0,0 +1,2 @@ +Drop, already unused plone.app.robotframework test. +[gforcada] From 940512d1ab6bdb1871214fc0f168484cad9a3fc1 Mon Sep 17 00:00:00 2001 From: David Glick Date: Sat, 14 Oct 2023 10:58:38 -0700 Subject: [PATCH 3/3] Depend on test extra of plone.app.contenttypes instead of requiring plone.app.robotframework directly --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py index f92118d2e4..66854ff2f2 100644 --- a/setup.py +++ b/setup.py @@ -42,8 +42,7 @@ def read(filename): TEST_REQUIRES = [ "collective.MockMailHost", "plone.app.caching", - "plone.app.contenttypes", - "plone.app.robotframework", + "plone.app.contenttypes[test]", "plone.app.testing", "plone.api", "requests",