cleanup

Author: blink1073

.evergreen/scripts/setup_tests.py

@@ -240,16 +240,19 @@ def handle_test_env() -> None:
         run_command(cmd)
 
     if test_name == "ocsp":
-        for name in ["OCSP_SERVER_TYPE", "OCSP_ALGORITHM"]:
+        if sub_test_name:
+            os.environ["OCSP_SERVER_TYPE"] = sub_test_name
+        for name in ["OCSP_SERVER_TYPE", "ORCHESTRATION_FILE"]:
             if name not in os.environ:
                 raise ValueError(f"Please set {name}")
         server_type = os.environ["OCSP_SERVER_TYPE"]
         should_succeed = "true" if "valid" in server_type else "false"
         write_env("OCSP_TLS_SHOULD_SUCCEED", should_succeed)
-        ocsp_algo = os.environ["OCSP_ALGORITHM"]
-        write_env("CA_FILE", f"{{DRIVERS_TOOLS}}/.evergreen/ocsp/{ocsp_algo}/ca.pem")
+        ocsp_algo = os.environ["ORCHESTRATION_FILE"].split("-")[0]
+        write_env("CA_FILE", f"{DRIVERS_TOOLS}/.evergreen/ocsp/{ocsp_algo}/ca.pem")
         env = os.environ.copy()
         env["SERVER_TYPE"] = server_type
+        env["OCSP_ALGORITHM"] = ocsp_algo
         run_command(f"bash {DRIVERS_TOOLS}/.evergreen/ocsp/setup.sh", env=env)
 
     if SSL != "nossl":

CONTRIBUTING.md

@@ -218,12 +218,12 @@ the pages will re-render and the browser will automatically refresh.
 ### Usage
 
 - Run `just run-server` with optional args to set up the server.
-  All given flags will be passed to `run-orchestration.sh` in `DRIVERS_TOOLS`.
+  All given flags will be passed to `run-orchestration.sh` in `$DRIVERS_TOOLS`.
 - Run `just setup-tests` with optional args to set up the test environment, secrets, etc.
 - Run `just run-tests` to run the tests in an appropriate Python environment.
 - When done, run `just teardown-tests` to clean up and `just stop-server` to stop the server.
 
-## Encryption tests
+### Encryption tests
 
 - Run `just run-server` to start the server.
 - Run `just setup-tests encryption`.
@@ -236,13 +236,13 @@ the pages will re-render and the browser will automatically refresh.
 - Set up the test with `just setup-tests load_balancer`.
 - Run the tests with `just run-tests`.
 
-## AWS tests
+### AWS tests
 
 - Run `just run-server auth_aws` to start the server.
 - Run `just setup-tests auth_aws <aws-test-type>` to set up the AWS test.
 - Run the tests with `just run-tests`.
 
-## KMS tests
+### KMS tests
 
 For KMS tests that are run locally, and expected to fail, in this case using `azure`:
 
@@ -255,6 +255,15 @@ For KMS tests that run remotely and are expected to pass, in this case using `gc
 - Run `just setup-tests kms gcp`.
 - Run `just run-tests`.
 
+### OCSP tests
+
+  - Export the algorithm, e.g. `export ORCHESTRATION_FILE=rsa-basic-tls-ocsp-mustStaple.json`.
+    This corresponds to a config file in `$DRIVERS_TOOLS/.evergreen/orchestration/configs/servers`.
+    Only the rsa algorithm works on MacOS.
+  - Run `just run-server ocsp`.
+  - Run `just setup-tests ocsp valid` (options are "valid", "revoked", "valid-delegate", "revoked-delegate").
+  - Run `just run-tests`
+
 ## Enable Debug Logs
 - Use `-o log_cli_level="DEBUG" -o log_cli=1` with `just test` or `pytest`.
 - Add `log_cli_level = "DEBUG` and `log_cli = 1` to the `tool.pytest.ini_options` section in `pyproject.toml` for Evergreen patches or to enable debug logs by default on your machine.