separate gc/cc intervals

cypress-io · Jan 13, 2020 · 579ef3b · 579ef3b · cypress-bot · Jan 13, 2020
1 parent 1180379
commit 579ef3b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 22 deletions.
diff --git a/packages/driver/src/cy/commands/window.coffee b/packages/driver/src/cy/commands/window.coffee
@@ -37,15 +37,15 @@ module.exports = (Commands, Cypress, cy, state, config) ->
 
  Cypress.on "test:before:run:async", (testAttrs) ->
  { order } = testAttrs
- fmri = config("firefoxMemoryReductionInterval")
 
- ## TODO: add !isInteractive here too
+ if Cypress.isBrowser('firefox')
+ ## TODO: add !isInteractive here too
+ shouldRunCc = (order % config("firefoxCcInterval") is 0)
+ shouldRunGc = (order % config("firefoxGcInterval") is 0)
+
+ if shouldRunCc or shouldRunGc
+ Cypress.backend("reduce:memory:pressure", { shouldRunCc, shouldRunGc })
 
- ## if we've enabled firefox memory reduction
- ## and the test order matches this interval
- if fmri > 0 and order % fmri is 0 && Cypress.isBrowser('firefox')
- Cypress.backend("reduce:memory:pressure")
-
  Cypress.on "test:before:run:async", ->
  ## if we have viewportDefaults it means
  ## something has changed the default and we

diff --git a/packages/server/lib/browsers/firefox-util.ts b/packages/server/lib/browsers/firefox-util.ts
@@ -10,6 +10,11 @@ import util from 'util'
 import Foxdriver from '@benmalka/foxdriver'
 import { _connectAsync } from './protocol'
 
+type CollectGarbageArgs = {
+ shouldRunGc: boolean
+ shouldRunCc: boolean
+}
+
 const debug = Debug('cypress:server:browsers')
 
 const promisify = (fn) => {
@@ -28,7 +33,7 @@ const promisify = (fn) => {
 
 let sendMarionette
 
-let cb
+let cb: (args: CollectGarbageArgs) => Promise<void>
 
 let timings = {
  gc: [] as any[],
@@ -96,8 +101,8 @@ module.exports = {
  log()
  },
 
- collectGarbage () {
- return cb()
+ collectGarbage (args: CollectGarbageArgs) {
+ return cb(args)
  },
 
  setup (extensions, url) {
@@ -168,12 +173,12 @@ module.exports = {
  })
  })
 
- cb = () => {
+ cb = (args: CollectGarbageArgs) => {
  let duration
 
  const gc = (tab) => {
  return () => {
- if (process.env.CYPRESS_SKIP_GC) {
+ if (!args.shouldRunGc) {
  return
  }
 
@@ -191,7 +196,7 @@ module.exports = {
 
  const cc = (tab) => {
  return () => {
- if (process.env.CYPRESS_SKIP_CC) {
+ if (!args.shouldRunCc) {
  return
  }
 
@@ -212,17 +217,9 @@ module.exports = {
  return attach(tab)
  .then(gc(tab))
  .then(cc(tab))
- // .then(() => {
- // return tab.memory.measure()
- // .then(console.log)
- // })
- // })
  })
  .tapCatch((err) => {
  console.log('firefox RDP error', err.stack)
-
- // eslint-disable-next-line no-debugger
- debugger
  })
  }
  },

diff --git a/packages/server/lib/config.coffee b/packages/server/lib/config.coffee
@@ -88,6 +88,8 @@ breakingConfigKeys = toWords """
 # Internal configuration properties the user should be able to overwrite
 systemConfigKeys = toWords """
  browsers
+ firefoxGcInterval
+ firefoxCcInterval
 """
 
 CONFIG_DEFAULTS = {
@@ -140,6 +142,8 @@ CONFIG_DEFAULTS = {
  pluginsFile: "cypress/plugins"
  nodeVersion: "default"
  configFile: "cypress.json"
+ firefoxGcInterval: 1
+ firefoxCcInterval: 1
 
  ## deprecated
  javascripts: []
@@ -181,6 +185,8 @@ validationRules = {
  viewportWidth: v.isNumber
  waitForAnimations: v.isBoolean
  watchForFileChanges: v.isBoolean
+ firefoxCcInterval: v.isNumber
+ firefoxCcInterval: v.isNumber
 }
 
 convertRelativeToAbsolutePaths = (projectRoot, obj, defaults = {}) ->

diff --git a/packages/server/lib/socket.js b/packages/server/lib/socket.js
@@ -373,7 +373,7 @@ class Socket {
  case 'log:memory:pressure':
  return firefoxUtil.log()
  case 'reduce:memory:pressure':
- return firefoxUtil.collectGarbage()
+ return firefoxUtil.collectGarbage(args[0])
  case 'incoming:xhr':
  return options.onIncomingXhr(args[0], args[1])
  case 'get:fixture':