Move integration tests to cli/tests.

These tests used `assert_cmd::carg::cargo_bin`, which is deprecated.
It is meant to be replaced with the macro `assert_cmd::cargo_bin!`,
which required tests to be moved to the `cli` crate.
If tests hadn't been moved, that macro would fail to find the binary,
as the `CARGO_BIN_EXE_*` environment variable with the absolute path
to a binary target’s executable would not have been set.
Moving the tests causes it to be set, and the macro then works.

See https://doc.rust-lang.org/beta/cargo/reference/environment-variables.html

Author: rockbmb

Cargo.lock

@@ -30,3 +30,11 @@ sp-storage = { workspace = true }
 try-runtime-core = { workspace = true }
 
 frame-support = { workspace = true }
+
+[dev-dependencies]
+assert_cmd = { workspace = true }
+# Only needed in tests
+frame-remote-externalities = { workspace = true }
+regex = { workspace = true }
+substrate-cli-test-utils = { workspace = true, features = ["try-runtime"] }
+tempfile = { workspace = true }

cli/Cargo.toml

@@ -22,7 +22,7 @@ use std::{
     time::Duration,
 };
 
-use assert_cmd::cargo::cargo_bin;
+use assert_cmd::cargo_bin;
 use frame_remote_externalities::{Builder, Mode, OfflineConfig, SnapshotConfig};
 use sp_runtime::{
     generic::{Block, Header},
@@ -70,7 +70,7 @@ async fn create_snapshot_works() {
             snap_file: &PathBuf,
             at: sp_core::H256,
         ) -> tokio::process::Child {
-            Command::new(cargo_bin("try-runtime"))
+            Command::new(cargo_bin!("try-runtime"))
                 .stdout(std::process::Stdio::piped())
                 .stderr(std::process::Stdio::piped())
                 .arg("--runtime=existing")

core/tests/create_snapshot.rs cli/tests/create_snapshot.rscore/tests/create_snapshot.rs renamed to cli/tests/create_snapshot.rs

@@ -19,7 +19,7 @@
 
 use std::time::Duration;
 
-use assert_cmd::cargo::cargo_bin;
+use assert_cmd::cargo_bin;
 use regex::Regex;
 use substrate_cli_test_utils as common;
 use tokio::process::Command;
@@ -53,7 +53,7 @@ async fn execute_block_works() {
         let ws_url = format!("ws://localhost:{}", port);
 
         fn execute_block(ws_url: &str, at: sp_core::H256) -> tokio::process::Child {
-            Command::new(cargo_bin("try-runtime"))
+            Command::new(cargo_bin!("try-runtime"))
                 .stdout(std::process::Stdio::piped())
                 .stderr(std::process::Stdio::piped())
                 .arg("--runtime=existing")
@@ -95,7 +95,7 @@ async fn execute_block_works() {
         let ws_url = format!("ws://localhost:{}", port);
 
         fn execute_block(ws_url: &str) -> tokio::process::Child {
-            Command::new(cargo_bin("try-runtime"))
+            Command::new(cargo_bin!("try-runtime"))
                 .stdout(std::process::Stdio::piped())
                 .stderr(std::process::Stdio::piped())
                 .arg("--runtime=existing")

core/tests/execute_block.rs cli/tests/execute_block.rscore/tests/execute_block.rs renamed to cli/tests/execute_block.rs

@@ -19,7 +19,7 @@
 
 use std::time::Duration;
 
-use assert_cmd::cargo::cargo_bin;
+use assert_cmd::cargo_bin;
 use regex::Regex;
 use substrate_cli_test_utils as common;
 use tokio::process::Command;
@@ -50,7 +50,7 @@ async fn follow_chain_works() {
 
     common::run_with_timeout(Duration::from_secs(60), async move {
         fn start_follow(ws_url: &str) -> tokio::process::Child {
-            Command::new(cargo_bin("try-runtime"))
+            Command::new(cargo_bin!("try-runtime"))
                 .stdout(std::process::Stdio::piped())
                 .stderr(std::process::Stdio::piped())
                 .arg("--runtime=existing")

core/tests/follow_chain.rs cli/tests/follow_chain.rscore/tests/follow_chain.rs renamed to cli/tests/follow_chain.rs

@@ -3,7 +3,7 @@
 mod on_runtime_upgrade {
     use std::{path::PathBuf, time::Duration};
 
-    use assert_cmd::cargo::cargo_bin;
+    use assert_cmd::cargo_bin;
     use substrate_cli_test_utils as common;
     use tokio::process::Command;
 
@@ -53,7 +53,7 @@ mod on_runtime_upgrade {
     }
 
     fn on_runtime_upgrade(config: &TestConfig) -> tokio::process::Child {
-        let path = cargo_bin("try-runtime");
+        let path = cargo_bin!("try-runtime");
         assert!(
             path.exists(),
             "try-runtime binary not found at path: {}",