integration: Bundle tests in src (#665)

Integration tests are split out so each is effectively its own build
target. While this is convenient at times, it also means that compiling
all integration tests is SLOW.

By bundling them all into the integration/src, we avoid having to
recompile/link the proxy many times when building integration tests.

Author: olix0r

.github/workflows/rust.yml

@@ -3,7 +3,7 @@ name: Rust PR
 on:
   push:
     branches:
-    - master
+      - master
   pull_request: {}
 
 jobs:
@@ -12,21 +12,20 @@ jobs:
     container:
       image: docker://rust:1.44.1-buster
     steps:
-    - uses: actions/checkout@v1
-    - run: rustup component add rustfmt
-    - run: make check-fmt
+      - uses: actions/checkout@v1
+      - run: rustup component add rustfmt
+      - run: make check-fmt
 
-  lib:
+  check:
     runs-on: ubuntu-18.04
     container:
       image: docker://rust:1.44.1-buster
     steps:
-    - uses: actions/checkout@v1
-    - run: make test-lib
+      - uses: actions/checkout@v1
+      - run: make check
 
-  integration:
+  test:
     runs-on: ubuntu-18.04
     steps:
-    - uses: actions/checkout@v1
-    - name: Test
-      run: make test-integration
+      - uses: actions/checkout@v1
+      - run: make test

Makefile

@@ -68,6 +68,10 @@ endif
 fetch: Cargo.lock
 	$(CARGO) fetch --locked
 
+.PHONY: check
+check: fetch
+	$(CARGO) check
+
 .PHONY: build
 build: $(TARGET_BIN)
 
@@ -89,16 +93,9 @@ shellcheck:
 		! -path "$(CURDIR)"/.git/hooks/\*.sample \
 		| while read -r f; do [ "$$(file -b --mime-type "$$f")" = 'text/x-shellscript' ] && printf '%s\0' "$$f"; done | xargs -0)
 
-.PHONY: test-lib
-test-lib:: fetch
-	$(CARGO_TEST) --lib
-
-.PHONY: test-integration
-test-integration: fetch
-	$(CARGO_TEST) --tests
-
 .PHONY: test
-test: test-lib test-integration
+test: fetch
+	$(CARGO_TEST)
 
 .PHONY: test-flakey
 test-flakey: fetch

linkerd/app/integration/src/lib.rs

@@ -6,6 +6,9 @@
 
 mod test_env;
 
+#[cfg(test)]
+mod tests;
+
 pub use self::test_env::TestEnv;
 pub use bytes::{Buf, BufMut, Bytes};
 pub use futures::{future, FutureExt, TryFuture, TryFutureExt};

linkerd/app/integration/tests/discovery.rs renamed to linkerd/app/integration/src/tests/discovery.rs

@@ -1,8 +1,4 @@
-#![deny(warnings, rust_2018_idioms)]
-#![type_length_limit = "16289823"]
-#![recursion_limit = "256"]
-
-use linkerd2_app_integration::*;
+use crate::*;
 
 macro_rules! generate_tests {
     (server: $make_server:path, client: $make_client:path) => {
@@ -549,7 +545,7 @@ macro_rules! generate_tests {
 }
 
 mod http2 {
-    use linkerd2_app_integration::*;
+    use crate::*;
 
     generate_tests! { server: server::new, client: client::new }
 
@@ -610,14 +606,14 @@ mod http2 {
 }
 
 mod http1 {
-    use linkerd2_app_integration::*;
+    use crate::*;
 
     generate_tests! {
         server: server::http1, client: client::http1
     }
 
     mod absolute_uris {
-        use linkerd2_app_integration::*;
+        use crate::*;
 
         generate_tests! {
             server: server::http1,

linkerd/app/integration/tests/identity.rs renamed to linkerd/app/integration/src/tests/identity.rs

@@ -1,8 +1,4 @@
-#![deny(warnings, rust_2018_idioms)]
-#![type_length_limit = "16289823"]
-#![recursion_limit = "256"]
-
-use linkerd2_app_integration::*;
+use crate::*;
 use std::{
     sync::{
         atomic::{AtomicBool, Ordering},

linkerd/app/integration/src/tests/mod.rs

@@ -0,0 +1,9 @@
+mod discovery;
+mod identity;
+mod orig_proto;
+mod profile_dst_overrides;
+mod profiles;
+mod shutdown;
+mod tap;
+mod telemetry;
+mod transparency;

linkerd/app/integration/tests/orig_proto.rs renamed to linkerd/app/integration/src/tests/orig_proto.rs

@@ -1,7 +1,4 @@
-#![deny(warnings, rust_2018_idioms)]
-#![type_length_limit = "16289823"]
-
-use linkerd2_app_integration::*;
+use crate::*;
 
 #[tokio::test]
 async fn outbound_http1() {

linkerd/app/integration/tests/profile_dst_overrides.rs renamed to linkerd/app/integration/src/tests/profile_dst_overrides.rs

@@ -1,8 +1,4 @@
-#![deny(warnings, rust_2018_idioms)]
-#![type_length_limit = "16289823"]
-#![recursion_limit = "256"]
-
-use linkerd2_app_integration::*;
+use crate::*;
 use linkerd2_proxy_api::destination as pb;
 use std::sync::atomic::{AtomicUsize, Ordering};
 

linkerd/app/integration/tests/profiles.rs renamed to linkerd/app/integration/src/tests/profiles.rs

@@ -1,8 +1,4 @@
-#![deny(warnings, rust_2018_idioms)]
-#![type_length_limit = "16289823"]
-#![recursion_limit = "256"]
-
-use linkerd2_app_integration::*;
+use crate::*;
 use std::sync::atomic::{AtomicUsize, Ordering};
 
 macro_rules! profile_test {

linkerd/app/integration/tests/shutdown.rs renamed to linkerd/app/integration/src/tests/shutdown.rs

@@ -1,8 +1,4 @@
-#![deny(warnings, rust_2018_idioms)]
-#![type_length_limit = "16289823"]
-#![recursion_limit = "256"]
-
-use linkerd2_app_integration::*;
+use crate::*;
 
 #[tokio::test]
 async fn h2_goaways_connections() {