Patchwork [1,of,4] run-tests: ignore failed removal of nonexistent installerrs

login
register
mail settings
Submitter Augie Fackler
Date Aug. 27, 2015, 9:22 p.m.
Message ID <a95e83c37395eaf43d95.1440710520@imladris.local>
Download mbox | patch
Permalink /patch/10302/
State Accepted
Headers show

Comments

Augie Fackler - Aug. 27, 2015, 9:22 p.m.
# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1440477642 14400
#      Tue Aug 25 00:40:42 2015 -0400
# Node ID a95e83c37395eaf43d9584f50228c94fec3d084d
# Parent  3670efdc70885ea0d1eaec101d598416d95490e2
run-tests: ignore failed removal of nonexistent installerrs

When running tests with -j100 or so on a large machine, I see this
os.remove call failing semi-regularly. Since it's not really a problem
when the file is already gone, just suppress the error in that case.

Patch

diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -2078,7 +2078,11 @@  class TestRunner(object):
         vlog("# Running", cmd)
         if os.system(cmd) == 0:
             if not self.options.verbose:
-                os.remove(installerrs)
+                try:
+                    os.remove(installerrs)
+                except OSError as e:
+                    if e.errno != errno.ENOENT:
+                        raise
         else:
             f = open(installerrs, 'rb')
             for line in f: