From 8f47aa802a5e0c9dae9c0f43a1c70b3512b2c8b2 Mon Sep 17 00:00:00 2001 From: Eric Rakestraw Date: Wed, 9 Sep 2026 19:15:09 +0000 Subject: [PATCH] Clean up Scriptorium review findings --- README.md | 2 -- tests/integration | 15 +++++++-------- tests/verify-config.yml | 6 ++---- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 8473097..2e534b7 100644 --- a/README.md +++ b/README.md @@ -77,5 +77,3 @@ directory, then restores the default deployment during cleanup. ```sh tests/integration ``` - -Ansible role to install the Scriptorium application. diff --git a/tests/integration b/tests/integration index b9f29d8..6df91bc 100755 --- a/tests/integration +++ b/tests/integration @@ -83,17 +83,16 @@ run_converge "$recovery_repeat_log" \ -e "scriptorium_go_binary=$custom_go_binary" require_clean_recap "$recovery_repeat_log" -representative_log="$test_tmp/representative.log" -run_converge "$representative_log" \ - -e "scriptorium_profile_dir=$profile_dir" \ - -e 'scriptorium_server_addr=127.0.0.1:18080' \ +representative_args=( + -e "scriptorium_profile_dir=$profile_dir" + -e 'scriptorium_server_addr=127.0.0.1:18080' -e '{"scriptorium_server_max_request_bytes": 0, "scriptorium_server_artifact_root": null, "scriptorium_schema_dir": null, "scriptorium_defaults_render_format": "json", "scriptorium_backends": {"fixture-backend": {"endpoint": "http://127.0.0.1:8000/v1", "concurrency_limit": 1, "queue_capacity": 0, "extra_params": {"stream": false}}}}' +) +representative_log="$test_tmp/representative.log" +run_converge "$representative_log" "${representative_args[@]}" "$binary_path" inspect profile --config "$config_path" --profile backend-profile "$ansible_playbook" -i "$inventory" \ -e "scriptorium_test_profile_dir=$profile_dir" "$verify_config" representative_repeat_log="$test_tmp/representative-repeat.log" -run_converge "$representative_repeat_log" \ - -e "scriptorium_profile_dir=$profile_dir" \ - -e 'scriptorium_server_addr=127.0.0.1:18080' \ - -e '{"scriptorium_server_max_request_bytes": 0, "scriptorium_server_artifact_root": null, "scriptorium_schema_dir": null, "scriptorium_defaults_render_format": "json", "scriptorium_backends": {"fixture-backend": {"endpoint": "http://127.0.0.1:8000/v1", "concurrency_limit": 1, "queue_capacity": 0, "extra_params": {"stream": false}}}}' +run_converge "$representative_repeat_log" "${representative_args[@]}" require_clean_recap "$representative_repeat_log" diff --git a/tests/verify-config.yml b/tests/verify-config.yml index 2fe508e..7e93189 100644 --- a/tests/verify-config.yml +++ b/tests/verify-config.yml @@ -10,10 +10,6 @@ src: "{{ scriptorium_config_path }}" register: scriptorium_config_file - - name: Parse the managed configuration - ansible.builtin.set_fact: - scriptorium_config: "{{ scriptorium_config_file.content | b64decode | from_yaml }}" - - name: Verify representative configuration mappings ansible.builtin.assert: that: @@ -29,3 +25,5 @@ - scriptorium_config.backends["fixture-backend"].concurrency_limit == 1 - scriptorium_config.backends["fixture-backend"].queue_capacity == 0 - scriptorium_config.backends["fixture-backend"].extra_params.stream == false + vars: + scriptorium_config: "{{ scriptorium_config_file.content | b64decode | from_yaml }}"