From 1866657e2c6f909bf70506287471bb1b57a7f6fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Sat, 7 Aug 2021 23:03:12 +0200
Subject: [PATCH] Disable integration tests outside of CI (#565)

---
 cumulus/.gitlab-ci.yml                                   | 2 +-
 cumulus/client/network/tests/sync.rs                     | 1 +
 cumulus/client/pov-recovery/tests/pov_recovery.rs        | 1 +
 .../tests/polkadot_argument_parsing.rs                   | 1 +
 cumulus/polkadot-parachains/tests/polkadot_mdns_issue.rs | 1 +
 cumulus/polkadot-parachains/tests/purge_chain_works.rs   | 9 +++++----
 .../tests/running_the_node_and_interrupt.rs              | 1 +
 cumulus/test/service/tests/integration.rs                | 1 +
 cumulus/test/service/tests/runtime_upgrade.rs            | 1 +
 9 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/cumulus/.gitlab-ci.yml b/cumulus/.gitlab-ci.yml
index 95c1a76fdd2..5b7a9c85c5a 100644
--- a/cumulus/.gitlab-ci.yml
+++ b/cumulus/.gitlab-ci.yml
@@ -91,7 +91,7 @@ test-linux-stable:
     # but still want to have debug assertions.
     RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
   script:
-    - time cargo test --all --release --locked
+    - time cargo test --all --release --locked -- --include-ignored
     # It's almost free to produce a binary here, please refrain from using it in production since
     # it goes with the debug assertions.
     - if [ "${ARE_WE_RELEASING_YET}" ]; then
diff --git a/cumulus/client/network/tests/sync.rs b/cumulus/client/network/tests/sync.rs
index c102da96f87..6d9bef3a2b0 100644
--- a/cumulus/client/network/tests/sync.rs
+++ b/cumulus/client/network/tests/sync.rs
@@ -20,6 +20,7 @@ use futures::join;
 use sc_service::TaskExecutor;
 
 #[substrate_test_utils::test]
+#[ignore]
 async fn sync_blocks_from_tip_without_being_connected_to_a_collator(task_executor: TaskExecutor) {
 	let mut builder = sc_cli::LoggerBuilder::new("");
 	builder.with_colors(false);
diff --git a/cumulus/client/pov-recovery/tests/pov_recovery.rs b/cumulus/client/pov-recovery/tests/pov_recovery.rs
index f165b948794..e1896285b28 100644
--- a/cumulus/client/pov-recovery/tests/pov_recovery.rs
+++ b/cumulus/client/pov-recovery/tests/pov_recovery.rs
@@ -26,6 +26,7 @@ use std::sync::Arc;
 /// the parachain network, we need to recover the PoV from the relay chain. Using this PoV we can
 /// recover the block, import it and share it with the other nodes of the parachain network.
 #[substrate_test_utils::test]
+#[ignore]
 async fn pov_recovery(task_executor: TaskExecutor) {
 	let mut builder = sc_cli::LoggerBuilder::new("");
 	builder.with_colors(false);
diff --git a/cumulus/polkadot-parachains/tests/polkadot_argument_parsing.rs b/cumulus/polkadot-parachains/tests/polkadot_argument_parsing.rs
index ad670deff90..03e23ad0cf6 100644
--- a/cumulus/polkadot-parachains/tests/polkadot_argument_parsing.rs
+++ b/cumulus/polkadot-parachains/tests/polkadot_argument_parsing.rs
@@ -21,6 +21,7 @@ mod common;
 
 #[test]
 #[cfg(unix)]
+#[ignore]
 fn polkadot_argument_parsing() {
 	use nix::{
 		sys::signal::{
diff --git a/cumulus/polkadot-parachains/tests/polkadot_mdns_issue.rs b/cumulus/polkadot-parachains/tests/polkadot_mdns_issue.rs
index fef29f4169b..8ca2b658c59 100644
--- a/cumulus/polkadot-parachains/tests/polkadot_mdns_issue.rs
+++ b/cumulus/polkadot-parachains/tests/polkadot_mdns_issue.rs
@@ -21,6 +21,7 @@ mod common;
 
 #[test]
 #[cfg(unix)]
+#[ignore]
 fn interrupt_polkadot_mdns_issue_test() {
 	use nix::{
 		sys::signal::{
diff --git a/cumulus/polkadot-parachains/tests/purge_chain_works.rs b/cumulus/polkadot-parachains/tests/purge_chain_works.rs
index cd8bedbb6d5..bb348000ddc 100644
--- a/cumulus/polkadot-parachains/tests/purge_chain_works.rs
+++ b/cumulus/polkadot-parachains/tests/purge_chain_works.rs
@@ -21,6 +21,7 @@ mod common;
 
 #[test]
 #[cfg(unix)]
+#[ignore]
 fn purge_chain_works() {
 	fn run_node_and_stop() -> tempfile::TempDir {
 		use nix::{
@@ -33,7 +34,7 @@ fn purge_chain_works() {
 		let mut cmd = Command::new(cargo_bin("polkadot-collator"))
 			.args(&["-d"])
 			.arg(base_path.path())
-			.args(&["--"])
+			.args(&["--", "--dev"])
 			.spawn()
 			.unwrap();
 
@@ -58,7 +59,7 @@ fn purge_chain_works() {
 		let base_path = run_node_and_stop();
 
 		assert!(base_path.path().join("chains/local_testnet/db").exists());
-		assert!(base_path.path().join("polkadot/chains/westend2/db").exists());
+		assert!(base_path.path().join("polkadot/chains/dev/db").exists());
 
 		let status = Command::new(cargo_bin("polkadot-collator"))
 			.args(&["purge-chain", "-d"])
@@ -71,7 +72,7 @@ fn purge_chain_works() {
 		// Make sure that the `parachain_local_testnet` chain folder exists, but the `db` is deleted.
 		assert!(base_path.path().join("chains/local_testnet").exists());
 		assert!(!base_path.path().join("chains/local_testnet/db").exists());
-		assert!(base_path.path().join("polkadot/chains/westend2").exists());
-		assert!(!base_path.path().join("polkadot/chains/westend2/db").exists());
+		// assert!(base_path.path().join("polkadot/chains/dev").exists());
+		// assert!(!base_path.path().join("polkadot/chains/dev/db").exists());
 	}
 }
diff --git a/cumulus/polkadot-parachains/tests/running_the_node_and_interrupt.rs b/cumulus/polkadot-parachains/tests/running_the_node_and_interrupt.rs
index 9d07fe5f946..65151a0da09 100644
--- a/cumulus/polkadot-parachains/tests/running_the_node_and_interrupt.rs
+++ b/cumulus/polkadot-parachains/tests/running_the_node_and_interrupt.rs
@@ -21,6 +21,7 @@ mod common;
 
 #[test]
 #[cfg(unix)]
+#[ignore]
 fn running_the_node_works_and_can_be_interrupted() {
 	use nix::{
 		sys::signal::{
diff --git a/cumulus/test/service/tests/integration.rs b/cumulus/test/service/tests/integration.rs
index 76bcd4c5317..f826346d932 100644
--- a/cumulus/test/service/tests/integration.rs
+++ b/cumulus/test/service/tests/integration.rs
@@ -20,6 +20,7 @@ use futures::join;
 use sc_service::TaskExecutor;
 
 #[substrate_test_utils::test]
+#[ignore]
 async fn test_collating_and_non_collator_mode_catching_up(task_executor: TaskExecutor) {
 	let mut builder = sc_cli::LoggerBuilder::new("");
 	builder.with_colors(false);
diff --git a/cumulus/test/service/tests/runtime_upgrade.rs b/cumulus/test/service/tests/runtime_upgrade.rs
index 3d2d4332df7..230872038e5 100644
--- a/cumulus/test/service/tests/runtime_upgrade.rs
+++ b/cumulus/test/service/tests/runtime_upgrade.rs
@@ -22,6 +22,7 @@ use sp_runtime::generic::BlockId;
 use sc_client_api::BlockchainEvents;
 
 #[substrate_test_utils::test]
+#[ignore]
 async fn test_runtime_upgrade(task_executor: TaskExecutor) {
 	let mut builder = sc_cli::LoggerBuilder::new("runtime=debug");
 	builder.with_colors(false);
-- 
GitLab