diff --git a/tools/selenium_testing/options.py b/tools/selenium_testing/options.py index 9e4a9d42..fce26668 100644 --- a/tools/selenium_testing/options.py +++ b/tools/selenium_testing/options.py @@ -16,7 +16,8 @@ default_subject = "Selenium post creation" default_upload = "html/static/notbanned.png" default_post_password = "12345" default_board1 = "test" -default_board2 = "selenium2" +default_board2 = "test2" +default_staff_board = "selenium" default_staff_username = "admin" default_staff_password = "password" @@ -28,6 +29,7 @@ class TestingOptions: site: str board1: str board2: str + staff_board: str name: str email: str subject: str @@ -53,6 +55,7 @@ class TestingOptions: options.site = src_dict.get("site", default_site) options.board1 = src_dict.get("board1", default_board1) options.board2 = src_dict.get("board2", default_board2) + options.staff_board = src_dict.get("staff_board", default_staff_board) options.name = src_dict.get("name", default_name) options.email = src_dict.get("email", default_email) options.subject = src_dict.get("subject", default_subject) @@ -71,6 +74,7 @@ class TestingOptions: self.site = default_site self.board1 = default_board1 self.board2 = default_board2 + self.staff_board = default_staff_board self.name = default_name self.email = default_email self.subject = default_subject diff --git a/tools/selenium_testing/runtests.py b/tools/selenium_testing/runtests.py index 739bd2e8..89fc47a3 100755 --- a/tools/selenium_testing/runtests.py +++ b/tools/selenium_testing/runtests.py @@ -8,7 +8,8 @@ from argparse import ArgumentParser import unittest from .options import (TestingOptions, default_site, default_name, default_email, default_message, default_subject, - default_upload, default_post_password, default_board1, default_board2, default_staff_username, default_staff_password) + default_upload, default_post_password, default_board1, default_board2, default_staff_board, default_staff_username, + default_staff_password) from .tests import SeleniumTestCase from .tests.test_mgmt import TestManageActions from .tests.test_posting import TestPosting @@ -59,7 +60,6 @@ def close_tests(): def setup_selenium_args(parser:ArgumentParser): testable_browsers = ("firefox","chrome","chromium", "edge") - parser.add_argument("--browser", choices=testable_browsers, required=True) parser.add_argument("--headless", action="store_true", help="If set, the driver will run without opening windows (overrides --keep-open if it is set)") @@ -68,9 +68,11 @@ def setup_selenium_args(parser:ArgumentParser): parser.add_argument("--site", default=default_site, help=("Sets the site to be used for testing, defaults to %s" % default_site)) parser.add_argument("--board1", default=default_board1, - help="Sets the board to be used for testing") + help="Sets the main board to be used for testing. It must already be created or tests that use it will fail") parser.add_argument("--board2", default=default_board2, - help="Sets the board to be used for testing") + help="Sets the secondary board to be used for testing. It must already be created or tests that use it will fail") + parser.add_argument("--staff-board", default=default_staff_board, + help="Sets the board to be used for testing board management operations. It does not need to exist before testing") parser.add_argument("--name", default=default_name, help="Sets the name to be used when posting") parser.add_argument("--email", default=default_email,