rename to squeeze out a bit more balanced perf (2)

circle.yml

@@ -243,7 +243,7 @@ jobs:
       - restore_cache:
           key: cypress-{{ .Branch }}-{{ .Revision }}
       - run:
-          command: npm run test-e2e -- --index 0
+          command: npm run test-e2e -- --chunk 1
           working_directory: packages/server
       - store_test_results:
           path: /tmp/cypress
@@ -254,7 +254,7 @@ jobs:
       - restore_cache:
           key: cypress-{{ .Branch }}-{{ .Revision }}
       - run:
-          command: npm run test-e2e -- --index 1
+          command: npm run test-e2e -- --chunk 2
           working_directory: packages/server
       - store_test_results:
           path: /tmp/cypress
@@ -265,7 +265,7 @@ jobs:
       - restore_cache:
           key: cypress-{{ .Branch }}-{{ .Revision }}
       - run:
-          command: npm run test-e2e -- --index 2
+          command: npm run test-e2e -- --chunk 3
           working_directory: packages/server
       - store_test_results:
           path: /tmp/cypress
@@ -276,7 +276,7 @@ jobs:
       - restore_cache:
           key: cypress-{{ .Branch }}-{{ .Revision }}
       - run:
-          command: npm run test-e2e -- --index 3
+          command: npm run test-e2e -- --chunk 4
           working_directory: packages/server
       - store_test_results:
           path: /tmp/cypress
@@ -287,7 +287,7 @@ jobs:
       - restore_cache:
           key: cypress-{{ .Branch }}-{{ .Revision }}
       - run:
-          command: npm run test-e2e -- --index 4
+          command: npm run test-e2e -- --chunk 5
           working_directory: packages/server
       - store_test_results:
           path: /tmp/cypress
@@ -298,7 +298,7 @@ jobs:
       - restore_cache:
           key: cypress-{{ .Branch }}-{{ .Revision }}
       - run:
-          command: npm run test-e2e -- --index 5
+          command: npm run test-e2e -- --chunk 6
           working_directory: packages/server
       - store_test_results:
           path: /tmp/cypress
@@ -309,7 +309,7 @@ jobs:
       - restore_cache:
           key: cypress-{{ .Branch }}-{{ .Revision }}
       - run:
-          command: npm run test-e2e -- --index 6
+          command: npm run test-e2e -- --chunk 7
           working_directory: packages/server
       - store_test_results:
           path: /tmp/cypress

packages/server/test/scripts/e2e.js

@@ -22,7 +22,7 @@ const started = new Date()
 let numFailed = 0
 
 function isLoadBalanced (options) {
-  return _.isNumber(options.index)
+  return _.isNumber(options.chunk)
 }
 
 function spawn (cmd, args, opts) {
@@ -43,7 +43,7 @@ glob('test/e2e/**/*')
 
   if (isLoadBalanced(options)) {
     return _.filter(specs, (spec) => {
-      return path.basename(spec).startsWith(options.index)
+      return path.basename(spec).startsWith(options.chunk)
     })
   }
 

packages/server/test/scripts/rename.js

@@ -1,24 +1,80 @@
+/* eslint-disable no-console */
+
 require('@packages/coffee/register')
 
+const _ = require('lodash')
 const path = require('path')
+const Promise = require('bluebird')
+const minimist = require('minimist')
 const fs = require('../../lib/util/fs')
 const glob = require('../../lib/util/glob')
 
-glob('test/e2e/**/*')
-.map((spec) => {
-  spec += '.js'
+const options = minimist(process.argv.slice(2))
 
-  const specName = path.basename(spec)
+const { size, reset, snapshots } = options
 
-  const pathToSnapshot = path.resolve(
-    __dirname, '..', '..', '__snapshots__', specName.slice(2)
-  )
+const removeChunkPrefixes = () => {
+  const forwardSlashNumUnderscoreRe = /(\/\d_)/
+
+  const renameFiles = (pattern) => {
+    return glob(pattern)
+    .map((spec) => {
+      return fs.renameAsync(spec, spec.replace(forwardSlashNumUnderscoreRe, '/'))
+    })
+  }
 
-  const pathToRenamedSnapshot = path.join(
-    path.dirname(pathToSnapshot),
-    specName
+  return Promise.join(
+    renameFiles('test/e2e/**/*'),
+    renameFiles('__snapshots__/**/*')
   )
+}
+
+const renameSnapshotsToMatchSpecs = () => {
+  glob('test/e2e/**/*')
+  .map((spec) => {
+    spec += '.js'
+
+    const specName = path.basename(spec)
+
+    const pathToSnapshot = path.resolve(
+      __dirname, '..', '..', '__snapshots__', specName.slice(2)
+    )
+
+    const pathToRenamedSnapshot = path.join(
+      path.dirname(pathToSnapshot),
+      specName
+    )
+
+    return fs.renameAsync(pathToSnapshot, pathToRenamedSnapshot)
+  })
+  .catchReturn({ code: 'ENOENT' }, null)
+}
+
+if (reset) {
+  return removeChunkPrefixes()
+}
+
+if (snapshots) {
+  return renameSnapshotsToMatchSpecs()
+}
+
+glob('test/e2e/**/*')
+.then((specs) => {
+  if (!size) {
+    console.error('must include --size for calculating chunk size')
+  }
+
+  return _.chunk(specs, size)
+})
+.map((chunks, index) => {
+  index += 1
+
+  return Promise
+  .map(chunks, (spec) => {
+    const folder = path.dirname(spec)
+    const specName = path.basename(spec)
+    const renamedSpec = `${index}_${specName}`
 
-  return fs.renameAsync(pathToSnapshot, pathToRenamedSnapshot)
+    return fs.renameAsync(spec, path.join(folder, renamedSpec))
+  })
 })
-.catchReturn({ code: 'ENOENT' }, null)