Move impure download code to tests

sigp · Dec 3, 2020 · 9983d37 · 9983d37
1 parent a586bd6
commit 9983d37
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/validator_client/slashing_protection/Makefile b/validator_client/slashing_protection/Makefile
@@ -10,7 +10,7 @@ $(OUTPUT_DIR): $(TARBALL)
 	tar --strip-components=1 -xzf $^ -C $@
 
 $(TARBALL):
-	curl -L -o $@ $(ARCHIVE_URL)
+	curl --fail -L -o $@ $(ARCHIVE_URL)
 
 clean-test-files:
 	rm -rf $(OUTPUT_DIR)

diff --git a/validator_client/slashing_protection/build.rs b/validator_client/slashing_protection/build.rs
diff --git a/validator_client/slashing_protection/tests/interop.rs b/validator_client/slashing_protection/tests/interop.rs
@@ -2,7 +2,19 @@ use slashing_protection::interchange_test::MultiTestCase;
 use std::fs::File;
 use std::path::PathBuf;
 
+fn download_tests() {
+    let make_output = std::process::Command::new("make")
+        .current_dir(std::env::var("CARGO_MANIFEST_DIR").unwrap())
+        .output()
+        .expect("need `make` to succeed to download and untar slashing protection tests");
+    if !make_output.status.success() {
+        eprintln!("{}", String::from_utf8_lossy(&make_output.stderr));
+        panic!("Running `make` for slashing protection tests failed, see above");
+    }
+}
+
 fn test_root_dir() -> PathBuf {
+    download_tests();
     PathBuf::from(env!("CARGO_MANIFEST_DIR"))
         .join("interchange-tests")
         .join("tests")