Get ride of Config on Runtime

Signed-off-by: Ryan Levick <[email protected]>

Author: rylev

tests/conformance-tests/src/main.rs

@@ -1,10 +1,14 @@
 fn main() {
+    let spin_binary: std::path::PathBuf = std::env::args()
+        .skip(1)
+        .next()
+        .expect("expected first argument to be path to spin binary")
+        .into();
     let tests_dir = conformance_tests::download_tests().unwrap();
 
     for test in conformance_tests::tests(&tests_dir).unwrap() {
-        let spin_binary = "/Users/rylev/.local/bin/spin".into();
         let env_config = testing_framework::TestEnvironmentConfig::spin(
-            spin_binary,
+            spin_binary.clone(),
             [],
             move |e| {
                 e.copy_into(&test.manifest, "spin.toml")?;

tests/runtime-tests/src/lib.rs

@@ -6,14 +6,17 @@ use testing_framework::{
         in_process_spin::InProcessSpin,
         spin_cli::{SpinCli, SpinConfig},
     },
-    EnvTemplate, OnTestError, Runtime, ServicesConfig, TestEnvironment, TestEnvironmentConfig,
-    TestError, TestResult,
+    EnvTemplate, OnTestError, ServicesConfig, TestEnvironment, TestEnvironmentConfig, TestError,
+    TestResult,
 };
 
 /// Configuration for a runtime test
-pub struct RuntimeTestConfig<R: Runtime> {
+pub struct RuntimeTestConfig<R> {
+    /// Path to the test
     pub test_path: PathBuf,
-    pub runtime_config: R::Config,
+    /// Specific configuration for the runtime
+    pub runtime_config: R,
+    /// What to do when a test errors
     pub on_error: OnTestError,
 }
 
@@ -47,7 +50,7 @@ impl RuntimeTest<SpinCli> {
         })
     }
 
-    pub fn bootstrap(config: RuntimeTestConfig<SpinCli>) -> anyhow::Result<Self> {
+    pub fn bootstrap(config: RuntimeTestConfig<SpinConfig>) -> anyhow::Result<Self> {
         log::info!("Testing: {}", config.test_path.display());
         let test_path_clone = config.test_path.to_owned();
         let spin_binary = config.runtime_config.binary_path.clone();
@@ -116,7 +119,7 @@ impl RuntimeTest<InProcessSpin> {
         })
     }
 
-    pub fn bootstrap(config: RuntimeTestConfig<InProcessSpin>) -> anyhow::Result<Self> {
+    pub fn bootstrap(config: RuntimeTestConfig<()>) -> anyhow::Result<Self> {
         log::info!("Testing: {}", config.test_path.display());
         let test_path_clone = config.test_path.to_owned();
         let preboot = move |env: &mut TestEnvironment<InProcessSpin>| {
@@ -258,7 +261,7 @@ impl<R> RuntimeTest<R> {
     }
 }
 
-fn services_config<R: Runtime>(config: &RuntimeTestConfig<R>) -> anyhow::Result<ServicesConfig> {
+fn services_config<R>(config: &RuntimeTestConfig<R>) -> anyhow::Result<ServicesConfig> {
     let required_services = required_services(&config.test_path)?;
     let services_config = ServicesConfig::new(required_services)?;
     Ok(services_config)

tests/testing-framework/src/lib.rs

@@ -26,9 +26,7 @@ pub enum OnTestError {
 
 /// A runtime which can be tested
 pub trait Runtime {
-    type Config;
-
-    /// Return an error if one has occurred
+    /// Return an error if the runtime has errored
     fn error(&mut self) -> anyhow::Result<()>;
 }
 

tests/testing-framework/src/runtimes/in_process_spin.rs

@@ -52,8 +52,6 @@ impl InProcessSpin {
 }
 
 impl Runtime for InProcessSpin {
-    type Config = ();
-
     fn error(&mut self) -> anyhow::Result<()> {
         Ok(())
     }

tests/testing-framework/src/runtimes/spin_cli.rs

@@ -256,8 +256,6 @@ impl Drop for SpinCli {
 }
 
 impl Runtime for SpinCli {
-    type Config = SpinConfig;
-
     fn error(&mut self) -> anyhow::Result<()> {
         if !matches!(self.io_mode, IoMode::None) && self.try_wait()?.is_some() {
             anyhow::bail!("Spin exited early: {}", self.stderr());

tests/testing-framework/src/test_environment.rs

@@ -13,7 +13,7 @@ use anyhow::Context as _;
 /// A callback to create a runtime given a path to a temporary directory and a set of services
 pub type RuntimeCreator<R> = dyn FnOnce(&mut TestEnvironment<R>) -> anyhow::Result<R>;
 
-/// All the requirements to run a test
+/// An environment for running tests
 pub struct TestEnvironment<R> {
     temp: temp_dir::TempDir,
     services: Services,