diff --git a/.github/workflows/local_tests_den_dev.yaml b/.github/workflows/local_tests_den_dev.yaml index d328aa8dc..a35b09b24 100644 --- a/.github/workflows/local_tests_den_dev.yaml +++ b/.github/workflows/local_tests_den_dev.yaml @@ -21,8 +21,8 @@ jobs: # - name: pytest -v --level local tests/test_servers/ # env: - # TEST_TOKEN: ${{ secrets.TEST_TOKEN }} - # TEST_USERNAME: ${{ secrets.TEST_USERNAME }} + # KITCHEN_TESTER_DEV_TOKEN: ${{ secrets.KITCHEN_TESTER_DEV_TOKEN }} + # KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }} # run: pytest -v --level local tests/test_servers/ server-tests-logged-in-level-local: @@ -37,15 +37,14 @@ jobs: - name: Setup ~/.rh/config.yaml uses: ./.github/workflows/setup_rh_config with: - username: ${{ secrets.CI_ACCOUNT_USERNAME }} - token: ${{ secrets.CI_ACCOUNT_TOKEN }} + username: ${{ secrets.DEN_TESTER_USERNAME }} + token: ${{ secrets.DEN_TESTER_DEV_TOKEN }} api_server_url: ${{ env.API_SERVER_URL }} - - name: pytest -v --level local tests/test_servers/ env: - TEST_TOKEN: ${{ secrets.TEST_TOKEN }} - TEST_USERNAME: ${{ secrets.TEST_USERNAME }} + KITCHEN_TESTER_TOKEN: ${{ secrets.KITCHEN_TESTER_DEV_TOKEN }} + KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }} run: pytest -v --level local tests/test_servers/ --api-server-url $API_SERVER_URL timeout-minutes: 60 @@ -60,8 +59,8 @@ jobs: # - name: pytest -v --level local -k "not servertest and not secrettest" # env: - # TEST_TOKEN: ${{ secrets.TEST_TOKEN }} - # TEST_USERNAME: ${{ secrets.TEST_USERNAME }} + # KITCHEN_TESTER_DEV_TOKEN: ${{ secrets.KITCHEN_TESTER_DEV_TOKEN }} + # KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }} # run: pytest -v --level local -k "not servertest and not secrettest" most-tests-logged-in-level-local: @@ -76,15 +75,15 @@ jobs: - name: Setup ~/.rh/config.yaml uses: ./.github/workflows/setup_rh_config with: - username: ${{ secrets.CI_ACCOUNT_USERNAME }} - token: ${{ secrets.CI_ACCOUNT_TOKEN }} + username: ${{ secrets.DEN_TESTER_USERNAME }} + token: ${{ secrets.DEN_TESTER_DEV_TOKEN }} api_server_url: ${{ env.API_SERVER_URL }} - name: pytest -v --level local -k "not servertest and not secrettest and not moduletest and not functiontest and not envtest" env: - TEST_TOKEN: ${{ secrets.TEST_TOKEN }} - TEST_USERNAME: ${{ secrets.TEST_USERNAME }} - ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_TOKEN }} + KITCHEN_TESTER_TOKEN: ${{ secrets.KITCHEN_TESTER_DEV_TOKEN }} + KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }} + ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_DEV_TOKEN }} ORG_MEMBER_USERNAME: ${{ secrets.ORG_MEMBER_USERNAME }} run: pytest -v --level local -k "not servertest and not secrettest and not moduletest and not functiontest and not envtest" --api-server-url $API_SERVER_URL timeout-minutes: 60 @@ -100,8 +99,8 @@ jobs: # - name: pytest -v --level local -k "secrettest" # env: - # TEST_TOKEN: ${{ secrets.TEST_TOKEN }} - # TEST_USERNAME: ${{ secrets.TEST_USERNAME }} + # KITCHEN_TESTER_DEV_TOKEN: ${{ secrets.KITCHEN_TESTER_DEV_TOKEN }} + # KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }} # run: pytest -v --level local -k "secrettest" secret-tests-logged-in-level-local: @@ -116,15 +115,15 @@ jobs: - name: Setup ~/.rh/config.yaml uses: ./.github/workflows/setup_rh_config with: - username: ${{ secrets.CI_ACCOUNT_USERNAME }} - token: ${{ secrets.CI_ACCOUNT_TOKEN }} + username: ${{ secrets.DEN_TESTER_USERNAME }} + token: ${{ secrets.DEN_TESTER_DEV_TOKEN }} api_server_url: ${{ env.API_SERVER_URL }} - name: pytest -v --level local -k "secrettest" env: - TEST_TOKEN: ${{ secrets.TEST_TOKEN }} - TEST_USERNAME: ${{ secrets.TEST_USERNAME }} - ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_TOKEN }} + KITCHEN_TESTER_TOKEN: ${{ secrets.KITCHEN_TESTER_DEV_TOKEN }} + KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }} + ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_DEV_TOKEN }} ORG_MEMBER_USERNAME: ${{ secrets.ORG_MEMBER_USERNAME }} run: pytest -v --level local -k "secrettest" --api-server-url $API_SERVER_URL timeout-minutes: 60 @@ -141,15 +140,15 @@ jobs: - name: Setup ~/.rh/config.yaml uses: ./.github/workflows/setup_rh_config with: - username: ${{ secrets.CI_ACCOUNT_USERNAME }} - token: ${{ secrets.CI_ACCOUNT_TOKEN }} + username: ${{ secrets.DEN_TESTER_USERNAME }} + token: ${{ secrets.DEN_TESTER_DEV_TOKEN }} api_server_url: ${{ env.API_SERVER_URL }} - name: pytest -v --level local -k "moduletest" env: - TEST_TOKEN: ${{ secrets.TEST_TOKEN }} - TEST_USERNAME: ${{ secrets.TEST_USERNAME }} - ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_TOKEN }} + KITCHEN_TESTER_TOKEN: ${{ secrets.KITCHEN_TESTER_DEV_TOKEN }} + KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }} + ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_DEV_TOKEN }} ORG_MEMBER_USERNAME: ${{ secrets.ORG_MEMBER_USERNAME }} run: pytest -v --level local -k "moduletest" --api-server-url $API_SERVER_URL timeout-minutes: 60 @@ -166,15 +165,15 @@ jobs: - name: Setup ~/.rh/config.yaml uses: ./.github/workflows/setup_rh_config with: - username: ${{ secrets.CI_ACCOUNT_USERNAME }} - token: ${{ secrets.CI_ACCOUNT_TOKEN }} + username: ${{ secrets.DEN_TESTER_USERNAME }} + token: ${{ secrets.DEN_TESTER_DEV_TOKEN }} api_server_url: ${{ env.API_SERVER_URL }} - name: pytest -v --level local -k "functiontest" env: - TEST_TOKEN: ${{ secrets.TEST_TOKEN }} - TEST_USERNAME: ${{ secrets.TEST_USERNAME }} - ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_TOKEN }} + KITCHEN_TESTER_TOKEN: ${{ secrets.KITCHEN_TESTER_DEV_TOKEN }} + KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }} + ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_DEV_TOKEN }} ORG_MEMBER_USERNAME: ${{ secrets.ORG_MEMBER_USERNAME }} run: pytest -v --level local -k "functiontest" --api-server-url $API_SERVER_URL timeout-minutes: 60 @@ -191,15 +190,15 @@ jobs: - name: Setup ~/.rh/config.yaml uses: ./.github/workflows/setup_rh_config with: - username: ${{ secrets.CI_ACCOUNT_USERNAME }} - token: ${{ secrets.CI_ACCOUNT_TOKEN }} + username: ${{ secrets.DEN_TESTER_USERNAME }} + token: ${{ secrets.DEN_TESTER_DEV_TOKEN }} api_server_url: ${{ env.API_SERVER_URL }} - name: pytest -v --level local -k "envtest" env: - TEST_TOKEN: ${{ secrets.TEST_TOKEN }} - TEST_USERNAME: ${{ secrets.TEST_USERNAME }} - ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_TOKEN }} + KITCHEN_TESTER_TOKEN: ${{ secrets.KITCHEN_TESTER_DEV_TOKEN }} + KITCHEN_TESTER_USERNAME: ${{ secrets.KITCHEN_TESTER_USERNAME }} + ORG_MEMBER_TOKEN: ${{ secrets.ORG_MEMBER_DEV_TOKEN }} ORG_MEMBER_USERNAME: ${{ secrets.ORG_MEMBER_USERNAME }} run: pytest -v --level local -k "envtest" --api-server-url $API_SERVER_URL timeout-minutes: 60 diff --git a/tests/test_login.py b/tests/test_login.py index 05fe7d236..68c72e4d3 100644 --- a/tests/test_login.py +++ b/tests/test_login.py @@ -34,7 +34,7 @@ def add_secrets_to_vault(headers): def test_login_flow_in_new_env(): - token = os.getenv("TEST_TOKEN") + token = os.getenv("KITCHEN_TESTER_TOKEN") headers = {"Authorization": f"Bearer {token}"} add_secrets_to_vault(headers) diff --git a/tests/utils.py b/tests/utils.py index e0787e428..bb9cecbe5 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -71,12 +71,14 @@ def friend_account(): try: account = rns_client.load_account_from_env( - token_env_var="TEST_TOKEN", - usr_env_var="TEST_USERNAME", + token_env_var="KITCHEN_TESTER_TOKEN", + usr_env_var="KITCHEN_TESTER_USERNAME", dotenv_path=dotenv_path, ) if account is None: - pytest.skip("`TEST_TOKEN` or `TEST_USERNAME` not set, skipping test.") + pytest.skip( + "`KITCHEN_TESTER_TOKEN` or `KITCHEN_TESTER_USERNAME` not set, skipping test." + ) yield account finally: