use template from v2.0 branch of spin-python-sdk in test (#2421)

We're currently in the process of preparing a v3.0.0 release of the Python SDK,
and have made breaking changes to the API, but are not yet ready to publish the
release, so we should stick with a known-good version for Spin tests.

Signed-off-by: Joel Dice <[email protected]>

Author: dicej

tests/integration.rs

@@ -362,6 +362,7 @@ Caused by:
         http_smoke_test_template(
             "http-rust",
             None,
+            None,
             &[],
             |_| Ok(()),
             HashMap::default(),
@@ -500,6 +501,7 @@ Caused by:
         http_smoke_test_template(
             "http-py",
             Some("https://github.com/fermyon/spin-python-sdk"),
+            Some("v2.0"),
             &[],
             prebuild,
             env_vars,
@@ -513,6 +515,7 @@ Caused by:
         http_smoke_test_template(
             "http-c",
             None,
+            None,
             &[],
             |_| Ok(()),
             HashMap::default(),
@@ -532,6 +535,7 @@ Caused by:
         http_smoke_test_template(
             "http-go",
             None,
+            None,
             &[],
             prebuild,
             HashMap::default(),
@@ -551,6 +555,7 @@ Caused by:
         http_smoke_test_template(
             "http-js",
             Some("https://github.com/fermyon/spin-js-sdk"),
+            None,
             &["js2wasm"],
             prebuild,
             HashMap::default(),
@@ -570,6 +575,7 @@ Caused by:
         http_smoke_test_template(
             "http-ts",
             Some("https://github.com/fermyon/spin-js-sdk"),
+            None,
             &["js2wasm"],
             prebuild,
             HashMap::default(),
@@ -584,6 +590,7 @@ Caused by:
         http_smoke_test_template(
             "http-grain",
             None,
+            None,
             &[],
             |_| Ok(()),
             HashMap::default(),
@@ -597,6 +604,7 @@ Caused by:
         http_smoke_test_template(
             "http-zig",
             None,
+            None,
             &[],
             |_| Ok(()),
             HashMap::default(),
@@ -610,6 +618,7 @@ Caused by:
         http_smoke_test_template(
             "http-swift",
             None,
+            None,
             &[],
             |_| Ok(()),
             HashMap::default(),
@@ -623,6 +632,7 @@ Caused by:
         super::testcases::http_smoke_test_template_with_route(
             "http-php",
             None,
+            None,
             &[],
             |_| Ok(()),
             HashMap::default(),
@@ -637,6 +647,7 @@ Caused by:
         super::testcases::redis_smoke_test_template(
             "redis-go",
             None,
+            None,
             &[],
             |port| {
                 vec![
@@ -661,6 +672,7 @@ Caused by:
         super::testcases::redis_smoke_test_template(
             "redis-rust",
             None,
+            None,
             &[],
             |port| {
                 vec![
@@ -696,6 +708,7 @@ Caused by:
         let mut env = super::testcases::bootstrap_smoke_test(
             &services,
             None,
+            None,
             &[],
             "http-rust",
             |_| Ok(Vec::new()),

tests/testcases/mod.rs

@@ -159,6 +159,7 @@ fn preboot(
 pub fn http_smoke_test_template(
     template_name: &str,
     template_url: Option<&str>,
+    template_branch: Option<&str>,
     plugins: &[&str],
     prebuild_hook: impl FnOnce(&mut testing_framework::TestEnvironment<()>) -> anyhow::Result<()>,
     build_env_vars: HashMap<String, String>,
@@ -167,6 +168,7 @@ pub fn http_smoke_test_template(
     http_smoke_test_template_with_route(
         template_name,
         template_url,
+        template_branch,
         plugins,
         prebuild_hook,
         build_env_vars,
@@ -176,9 +178,12 @@ pub fn http_smoke_test_template(
 }
 
 /// Run a smoke test against a given http route for a `spin new` http template
+// TODO: refactor this function to not take so many arguments
+#[allow(clippy::too_many_arguments)]
 pub fn http_smoke_test_template_with_route(
     template_name: &str,
     template_url: Option<&str>,
+    template_branch: Option<&str>,
     plugins: &[&str],
     prebuild_hook: impl FnOnce(&mut testing_framework::TestEnvironment<()>) -> anyhow::Result<()>,
     build_env_vars: HashMap<String, String>,
@@ -188,6 +193,7 @@ pub fn http_smoke_test_template_with_route(
     let mut env = bootstrap_smoke_test(
         &testing_framework::ServicesConfig::none(),
         template_url,
+        template_branch,
         plugins,
         template_name,
         |_| Ok(Vec::new()),
@@ -211,6 +217,7 @@ pub fn http_smoke_test_template_with_route(
 pub fn redis_smoke_test_template(
     template_name: &str,
     template_url: Option<&str>,
+    template_branch: Option<&str>,
     plugins: &[&str],
     new_app_args: impl FnOnce(u16) -> Vec<String>,
     prebuild_hook: impl FnOnce(&mut testing_framework::TestEnvironment<()>) -> anyhow::Result<()>,
@@ -219,6 +226,7 @@ pub fn redis_smoke_test_template(
     let mut env = bootstrap_smoke_test(
         &testing_framework::ServicesConfig::new(vec!["redis".into()])?,
         template_url,
+        template_branch,
         plugins,
         template_name,
         |env| {
@@ -261,6 +269,7 @@ static TEMPLATE_MUTEX: std::sync::Mutex<()> = std::sync::Mutex::new(());
 pub fn bootstrap_smoke_test(
     services: &testing_framework::ServicesConfig,
     template_url: Option<&str>,
+    template_branch: Option<&str>,
     plugins: &[&str],
     template_name: &str,
     new_app_args: impl FnOnce(
@@ -281,6 +290,9 @@ pub fn bootstrap_smoke_test(
     let template_url = template_url.unwrap_or("https://github.com/fermyon/spin");
     let mut template_install = std::process::Command::new(spin_binary());
     template_install.args(["templates", "install", "--git", template_url, "--update"]);
+    if let Some(branch) = template_branch {
+        template_install.args(["--branch", branch]);
+    }
     // We need to serialize template installs since they can't be run in parallel
     {
         let _guard = TEMPLATE_MUTEX.lock().unwrap();