From 0ae9e6346bcd832df6340b231dfae15daa9d211e Mon Sep 17 00:00:00 2001 From: Aus Lacroix Date: Tue, 4 Aug 2015 13:31:30 -0700 Subject: [PATCH] bug 1188813 - Add clean-up when make node_modules fails before retry. a=test-only --- testing/mozharness/mozharness.json | 2 +- testing/mozharness/mozharness/mozilla/gaia.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/mozharness/mozharness.json b/testing/mozharness/mozharness.json index 90c7e9f39114..5403d63bd7b7 100644 --- a/testing/mozharness/mozharness.json +++ b/testing/mozharness/mozharness.json @@ -1,4 +1,4 @@ { "repo": "https://hg.mozilla.org/build/mozharness", - "revision": "d72df953784c" + "revision": "9e3b69e89620" } diff --git a/testing/mozharness/mozharness/mozilla/gaia.py b/testing/mozharness/mozharness/mozilla/gaia.py index 9ef54190d6c9..e7696b20a54c 100644 --- a/testing/mozharness/mozharness/mozilla/gaia.py +++ b/testing/mozharness/mozharness/mozilla/gaia.py @@ -381,7 +381,7 @@ class GaiaMixin(object): 'error_list': self.npm_error_list } code = self.retry(self.run_command, attempts=3, good_statuses=(0,), - args=[cmd, dirs['abs_gaia_dir']], kwargs=kwargs) + args=[cmd, dirs['abs_gaia_dir']], cleanup=cleanup_node_modules, kwargs=kwargs) if code: # Dump npm-debug.log, if it exists npm_debug = os.path.join(dirs['abs_gaia_dir'], 'npm-debug.log')