From 2350d9b096351d6162eacc6e62f5750bb39b23ed Mon Sep 17 00:00:00 2001 From: jmfiola Date: Mon, 8 Jan 2024 11:06:21 -0700 Subject: [PATCH] rp_token -> rp_uuid and rp_launch_name -> rp_launch --- requirements-dev.txt | 4 ++-- .../lib/configuration/gh_configuration.py | 18 ++++++++++++++++++ .../lib/fixtures/grasshopper_constants.py | 2 ++ tests/unit/conftest.py | 1 + .../test_grasshopper_configuration_fixtures.py | 1 + 5 files changed, 24 insertions(+), 2 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index e96a4f0..efdb187 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,7 +1,7 @@ assertpy==1.0 -black==22.1.0 +black==22.3.0 bump2version==1.0.1 -click==8.0.4 +click==8.1.3 coverage==6.3.2 flake8==6.0.0 flake8-import-order==0.18.2 diff --git a/src/grasshopper/lib/configuration/gh_configuration.py b/src/grasshopper/lib/configuration/gh_configuration.py index e32121d..ca246b3 100644 --- a/src/grasshopper/lib/configuration/gh_configuration.py +++ b/src/grasshopper/lib/configuration/gh_configuration.py @@ -115,6 +115,15 @@ class ConfigurationConstants: }, "rp_token": { "opts": ["--rp_token"], + "attrs": { + "action": "store", + "help": "LEGACY FOR RP_UUID: API token for accessing report portal " + "server. NYI. " + "programmatically.", + }, + }, + "rp_uuid": { + "opts": ["--rp_uuid"], "attrs": { "action": "store", "help": "API token for accessing report portal server. NYI. " @@ -262,6 +271,15 @@ class ConfigurationConstants: "typecast": typecast_bool, "default": False, }, + "rp_launch": { + "opts": ["--rp_launch"], + "attrs": { + "action": "store", + "help": "LEGACY FOR RP_LAUNCH: Base launch name to use when posting to " + "report portal. NYI", + }, + "default": "Grasshopper Performance Test Run | Launch name unknown", + }, "rp_launch_name": { "opts": ["--rp_launch_name"], "attrs": { diff --git a/src/grasshopper/lib/fixtures/grasshopper_constants.py b/src/grasshopper/lib/fixtures/grasshopper_constants.py index 9a26153..f72ab45 100644 --- a/src/grasshopper/lib/fixtures/grasshopper_constants.py +++ b/src/grasshopper/lib/fixtures/grasshopper_constants.py @@ -23,6 +23,8 @@ class GrasshopperConstants: "slack_report_failures_only", "cleanup_s3", "rp_token", + "rp_uuid", + "rp_launch", "rp_launch_name", "rp_project", "rp_endpoint", diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py index 852b5db..f2aacda 100644 --- a/tests/unit/conftest.py +++ b/tests/unit/conftest.py @@ -53,6 +53,7 @@ def current_global_defaults(): "influx": False, "report_portal": False, "rp_launch_name": "Grasshopper Performance Test Run | Launch name unknown", + "rp_launch": "Grasshopper Performance Test Run | Launch name unknown", } return defaults diff --git a/tests/unit/test_grasshopper_configuration_fixtures.py b/tests/unit/test_grasshopper_configuration_fixtures.py index c9df6c2..48b5386 100644 --- a/tests/unit/test_grasshopper_configuration_fixtures.py +++ b/tests/unit/test_grasshopper_configuration_fixtures.py @@ -27,6 +27,7 @@ def expected_global_defaults(): "influx": False, "report_portal": False, "rp_launch_name": "Grasshopper Performance Test Run | Launch name unknown", + "rp_launch": "Grasshopper Performance Test Run | Launch name unknown", } return defaults