Merge pull request #73 from paritytech/bernhard-papercuts

papercuts

Author: Xanewok

Cargo.lock

@@ -106,6 +106,7 @@ chrono = "0.4"
 itertools = "0.10"
 predicates = "1"
 selenium-rs = "0.1"
+serial_test = "0.5"
 
 [target.'cfg(unix)'.dependencies]
 daemonize = "0.4"

Cargo.toml

@@ -15,6 +15,7 @@ use sccache::dist::{
     AssignJobResult, CompileCommand, InputsReader, JobId, JobState, RunJobResult, ServerIncoming,
     ServerOutgoing, SubmitToolchainResult, Toolchain, ToolchainReader,
 };
+use serial_test::serial;
 use std::ffi::OsStr;
 use std::path::Path;
 
@@ -55,6 +56,7 @@ pub fn dist_test_sccache_client_cfg(
 
 #[test]
 #[cfg_attr(not(feature = "dist-tests"), ignore)]
+#[serial]
 fn test_dist_basic() {
     let tmpdir = tempfile::Builder::new()
         .prefix("sccache_dist_test")
@@ -88,6 +90,7 @@ fn test_dist_basic() {
 
 #[test]
 #[cfg_attr(not(feature = "dist-tests"), ignore)]
+#[serial]
 fn test_dist_restartedserver() {
     let tmpdir = tempfile::Builder::new()
         .prefix("sccache_dist_test")
@@ -124,6 +127,7 @@ fn test_dist_restartedserver() {
 
 #[test]
 #[cfg_attr(not(feature = "dist-tests"), ignore)]
+#[serial]
 fn test_dist_nobuilder() {
     let tmpdir = tempfile::Builder::new()
         .prefix("sccache_dist_test")
@@ -189,6 +193,7 @@ impl ServerIncoming for FailingServer {
 
 #[test]
 #[cfg_attr(not(feature = "dist-tests"), ignore)]
+#[serial]
 fn test_dist_failingserver() {
     let tmpdir = tempfile::Builder::new()
         .prefix("sccache_dist_test")

tests/dist.rs

@@ -25,16 +25,6 @@ use predicates::prelude::*;
 use serde::Serialize;
 use uuid::Uuid;
 
-#[cfg(feature = "dist-server")]
-macro_rules! matches {
-    ($expression:expr, $($pattern:tt)+) => {
-        match $expression {
-            $($pattern)+ => true,
-            _ => false
-        }
-    }
-}
-
 const CONTAINER_NAME_PREFIX: &str = "sccache_dist_test";
 const DIST_IMAGE: &str = "sccache_dist_test_image";
 const DIST_DOCKERFILE: &str = include_str!("Dockerfile.sccache-dist");

tests/harness/mod.rs

@@ -2,6 +2,7 @@
 #![cfg(all(feature = "dist-client"))]
 
 use selenium_rs::webdriver::{Browser, Selector, WebDriver};
+use serial_test::serial;
 use std::fs;
 use std::io::{self, Read, Write};
 use std::net::TcpStream;
@@ -189,6 +190,7 @@ impl Drop for SeleniumContainer {
     not(all(target_os = "linux", target_arch = "x86_64", feature = "dist-tests")),
     ignore
 )]
+#[serial]
 fn test_auth() {
     // Make sure the client auth port isn't in use, as sccache will gracefully fall back
     let client_auth_port = sccache::dist::client_auth::VALID_PORTS[0];