From bc2a11df9a5757c9d6bf71c17c500e1c7cd0b53d Mon Sep 17 00:00:00 2001
From: Matt Kangas <matt.kangas@mongodb.com>
Date: Fri, 22 Apr 2016 15:58:16 -0400
Subject: [PATCH 1/2] INT-958 add pretest task to invoke mongodb-runner, and
 reap old Electron procs

Avoid downloading a stable release of MongoDB during before() hook of a test;
this will likely cause a test timeout on Evergreen.

Reap old Electron procs on Evergreen
---
 .evergreen.yml | 9 ++++++---
 package.json   | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.evergreen.yml b/.evergreen.yml
index 3112e057db3..3e2b4bbc615 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -129,12 +129,12 @@ functions:
         # ${npm|npm} run check
 
         # Create a release build
-        ${npm|npm} run release;
-
+        npm run release;
         ls -alh dist/
 
         # Test the release build
-        ${npm|npm} run test-unit;
+        npm run test-unit;
+        # npm run test
         EOF_BUILD_SH
 
         #
@@ -378,6 +378,7 @@ buildvariants:
   expansions:
     build_via_local_tunnel: true
     fetch_npm_tarball: node-v5.5.0-npm-3.3.12-darwin-x64.tgz
+    killall_evergreen: 'pkill -9 Electron; pkill -9 mongod; pkill -9 mongos; pkill -9 mongo'
     node_path: "$(pwd)/.deps/bin"
     num_cores: $(sysctl -n hw.logicalcpu)
   tasks:
@@ -390,6 +391,7 @@ buildvariants:
   - "windows-64-vs2013-test"
   expansions:
     fetch_npm_tarball: node-v5.5.0-npm-3.3.12-windows-x64.tgz
+    killall_evergreen: 'pkill -9 Electron; pkill -9 mongod; pkill -9 mongos; pkill -9 mongo'
     node_path: "$(pwd)/.deps"
     num_cores: $(grep -c ^processor /proc/cpuinfo)
     add_env_appdata: Z:\
@@ -403,6 +405,7 @@ buildvariants:
   - "ubuntu1404-test"
   expansions:
     fetch_npm_tarball: node-v5.5.0-npm-3.3.12-linux-x64.tgz
+    killall_evergreen: 'pkill -9 electron; pkill -9 mongod; pkill -9 mongos; pkill -9 mongo'
     node_path: "$(pwd)/.deps/bin"
     compile_env: CC=/opt/mongodbtoolchain/bin/gcc CXX=/opt/mongodbtoolchain/bin/g++
     num_cores: $(grep -c ^processor /proc/cpuinfo)
diff --git a/package.json b/package.json
index 8947270e847..bd38cc65d81 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,7 @@
     "ci": "npm run test",
     "clean": "hadron-build clean",
     "compile-ui": "hadron-build ui",
+    "pretest": "mongodb-runner start && mongodb-runner stop",
     "fmt": "mongodb-js-fmt ./*.js src/{**/*.js,*.js} test/{**/*.js,*.js}",
     "release": "hadron-build release",
     "test-functional": "npm test -- --functional",

From 1aeddb3af40e1ed8a357259ff4f0f908e92fef11 Mon Sep 17 00:00:00 2001
From: Matt Kangas <matt.kangas@mongodb.com>
Date: Tue, 26 Apr 2016 12:24:42 -0400
Subject: [PATCH 2/2] evergreen: add exec_timeout_secs at 30 min

---
 .evergreen.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.evergreen.yml b/.evergreen.yml
index 3e2b4bbc615..08aab88743d 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -8,6 +8,9 @@
 
 stepback: false
 
+# Upper bound on any shell.exec task. 30 min should be plenty of time.
+exec_timeout_secs: 1800
+
 variables:
 # function "save release variants" is conditional on the following
 # -> all except ubuntu