fixed broken infinite cache tests

they may have always been broken (aka meaningless) in master
import-js · Aug 23, 2016 · 6e3b530 · 6e3b530
1 parent 3ce2344
commit 6e3b530
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/tests/src/core/resolve.js b/tests/src/core/resolve.js
@@ -50,6 +50,12 @@ describe('resolve', function () {
       'import/cache': { 'lifetime': 1 },
     })
 
+    const infiniteContexts = [ '∞', 'Infinity' ].map(inf => [inf,
+      utils.testContext({
+        'import/cache': { 'lifetime': inf },
+      })])
+
+
     const pairs = [
       ['./CaseyKasem.js', './CASEYKASEM2.js'],
     ]
@@ -62,6 +68,13 @@ describe('resolve', function () {
           expect(resolve(changed, context)).not.to.exist
         })
 
+        // settings are part of cache key
+        before('warm up infinite entries', function () {
+          infiniteContexts.forEach(([,c]) => {
+            expect(resolve(original, c)).to.exist
+          })
+        })
+
         before('rename', function (done) {
           fs.rename(
             utils.testFilePath(original),
@@ -86,19 +99,16 @@ describe('resolve', function () {
 
         // special behavior for infinity
         describe('infinite cache', function () {
-          this.timeout(1200)
-          before((done) => setTimeout(done, 1100))
+          this.timeout(1500)
 
-          const lifetimes = [ '∞', 'Infinity' ]
-          lifetimes.forEach(inf => {
-            const infiniteContext =  utils.testContext({
-              'import/cache': { 'lifetime': inf },
-            })
+          before((done) => setTimeout(done, 1100))
 
+          infiniteContexts.forEach(([inf, infiniteContext]) => {
             it(`lifetime: ${inf} still gets cached values after ~1s`, function () {
               expect(resolve(original, infiniteContext), original).to.exist
             })
           })
+
         })
 
         describe('finite cache', function () {

diff --git a/utils/ModuleCache.js b/utils/ModuleCache.js
@@ -1,6 +1,8 @@
 "use strict"
 exports.__esModule = true
 
+const log = require('debug')('eslint-module-utils:ModuleCache')
+
 class ModuleCache {
   constructor(map) {
     this.map = map || new Map()
@@ -13,6 +15,7 @@ class ModuleCache {
    */
   set(cacheKey, result) {
     this.map.set(cacheKey, { result, lastSeen: Date.now() })
+    log('setting entry for', cacheKey)
     return result
   }
 
@@ -21,7 +24,7 @@ class ModuleCache {
       const f = this.map.get(cacheKey)
       // check fresness
       if (Date.now() - f.lastSeen < (settings.lifetime * 1000)) return f.result
-    }
+    } else log('cache miss for', cacheKey)
     // cache miss
     return undefined
   }