From 289b3305790b8427a76ef34b341c045cb9b570bc Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Tue, 24 May 2016 14:58:29 -0700
Subject: [PATCH] Added ability to partition tests by tag

---
 tools/cli/commands.js          | 14 +++++++++++---
 tools/tool-testing/selftest.js | 23 ++++++++++++++++++++---
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 38a41e83b1..0150075d01 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -2014,7 +2014,11 @@ main.registerCommand({
     history: { type: Number },
     list: { type: Boolean },
     file: { type: String },
-    exclude: { type: String }
+    exclude: { type: String },
+    // Skip tests w/ this tag
+    'without-tag': { type: String },
+    // Only run tests with this tag
+    'with-tag': { type: String },
   },
   hidden: true,
   catalogRefresh: new catalog.Refresh.Never()
@@ -2081,7 +2085,9 @@ main.registerCommand({
       includeSlowTests: options.slow,
       galaxyOnly: options.galaxy,
       testRegexp: testRegexp,
-      fileRegexp: fileRegexp
+      fileRegexp: fileRegexp,
+      'without-tag': options['without-tag'],
+      'with-tag': options['with-tag']
     });
 
     return 0;
@@ -2108,7 +2114,9 @@ main.registerCommand({
     excludeRegexp: excludeRegexp,
     // other options
     historyLines: options.history,
-    clients: clients
+    clients: clients,
+    'without-tag': options['without-tag'],
+    'with-tag': options['with-tag']
   });
 
 });
diff --git a/tools/tool-testing/selftest.js b/tools/tool-testing/selftest.js
index 225bb4d28f..ce9f7b570e 100644
--- a/tools/tool-testing/selftest.js
+++ b/tools/tool-testing/selftest.js
@@ -1598,7 +1598,10 @@ var tagDescriptions = {
   // --changed, --file, or a pattern argument
   unchanged: 'unchanged since last pass',
   'non-matching': "don't match specified pattern",
-  'in other files': ""
+  'in other files': "",
+  // These tests require a setup step which can be amortized across multiple
+  // similar tests, so it makes sense to segregate them
+  'custom-warehouse': "requires a custom warehouse"
 };
 
 // Returns a TestList object representing a filtered list of tests,
@@ -1676,6 +1679,10 @@ var getFilteredTests = function (options) {
     }
   }
 
+  if (options['without-tag']) {
+    tagsToSkip.push(options['without-tag']);
+  }
+
   if (process.platform === "win32") {
     tagsToSkip.push("cordova");
     tagsToSkip.push("yet-unsolved-windows-failure");
@@ -1683,7 +1690,8 @@ var getFilteredTests = function (options) {
     tagsToSkip.push("windows");
   }
 
-  return new TestList(allTests, tagsToSkip, testState);
+  var tagsToMatch = options['with-tag'] ? [options['with-tag']] : [];
+  return new TestList(allTests, tagsToSkip, tagsToMatch, testState);
 };
 
 // A TestList is the result of getFilteredTests.  It holds the original
@@ -1694,7 +1702,7 @@ var getFilteredTests = function (options) {
 // ran and passed (for the `--changed` option).  If a testState is
 // provided, the notifyFailed and saveTestState can be used to modify
 // the testState appropriately and write it out.
-var TestList = function (allTests, tagsToSkip, testState) {
+var TestList = function (allTests, tagsToSkip, tagsToMatch, testState) {
   tagsToSkip = (tagsToSkip || []);
   testState = (testState || null); // optional
 
@@ -1721,6 +1729,15 @@ var TestList = function (allTests, tagsToSkip, testState) {
     }
     var fileInfo = self.fileInfo[test.file];
 
+    if (tagsToMatch.length) {
+      var matches = _.any(tagsToMatch, function(tag) {
+        return _.contains(test.tags, tag);
+      })
+      if (!matches) {
+        return false;
+      }
+    }
+
     // We look for tagsToSkip *in order*, and when we decide to
     // skip a test, we don't keep looking at more tags, and we don't
     // add the test to any further "skip counts".