Auto merge of #597 - Mark-Simulacrum:classify-network, r=Mark-Simulacrum

Classify network errors as spurious

This adds detection for a particularly common network error message.

Resolves #580.

Author: bors

src/report/display.rs

@@ -12,6 +12,7 @@ impl ResultName for FailureReason {
         match self {
             FailureReason::Unknown => "failed (unknown)".into(),
             FailureReason::Timeout => "timed out".into(),
+            FailureReason::NetworkAccess => "network access".into(),
             FailureReason::OOM => "OOM".into(),
             FailureReason::ICE => "ICE".into(),
             FailureReason::CompilerError(_) => "compiler error".into(),
@@ -23,6 +24,7 @@ impl ResultName for FailureReason {
         match self {
             FailureReason::CompilerError(_) | FailureReason::DependsOn(_) => self.to_string(),
             FailureReason::Unknown
+            | FailureReason::NetworkAccess
             | FailureReason::Timeout
             | FailureReason::OOM
             | FailureReason::ICE => self.short_name(),

src/results/mod.rs

@@ -198,6 +198,7 @@ pub enum FailureReason {
     OOM,
     Timeout,
     ICE,
+    NetworkAccess,
     CompilerError(BTreeSet<DiagnosticCode>),
     DependsOn(BTreeSet<Crate>),
 }
@@ -211,6 +212,7 @@ impl ::std::fmt::Display for FailureReason {
             FailureReason::OOM => write!(f, "oom"),
             FailureReason::Timeout => write!(f, "timeout"),
             FailureReason::ICE => write!(f, "ice"),
+            FailureReason::NetworkAccess => write!(f, "network-access"),
             FailureReason::CompilerError(codes) => write!(
                 f,
                 "compiler-error({})",
@@ -271,7 +273,7 @@ impl ::std::str::FromStr for FailureReason {
 impl FailureReason {
     pub(crate) fn is_spurious(&self) -> bool {
         match *self {
-            FailureReason::OOM | FailureReason::Timeout => true,
+            FailureReason::OOM | FailureReason::Timeout | FailureReason::NetworkAccess => true,
             FailureReason::CompilerError(_)
             | FailureReason::DependsOn(_)
             | FailureReason::Unknown

src/runner/test.rs

@@ -97,10 +97,15 @@ fn run_cargo<DB: WriteResults>(
     };
 
     let mut did_ice = false;
+    let mut did_network = false;
     let mut error_codes = BTreeSet::new();
     let mut deps = BTreeSet::new();
 
     let mut detect_error = |line: &str, actions: &mut ProcessLinesActions| {
+        if line.contains("urlopen error") && line.contains("Temporary failure in name resolution") {
+            did_network = true;
+        }
+
         // Avoid trying to deserialize non JSON output
         if !line.starts_with('{') {
             return;
@@ -169,6 +174,8 @@ fn run_cargo<DB: WriteResults>(
                 Err(e.context(FailureReason::DependsOn(deps)).into())
             } else if !error_codes.is_empty() {
                 Err(e.context(FailureReason::CompilerError(error_codes)).into())
+            } else if did_network {
+                Err(e.context(FailureReason::NetworkAccess).into())
             } else {
                 Err(e.into())
             }