Cache coverage

Author: Tofandel

lib/current-env.js

@@ -30,6 +30,21 @@ function getFamilyFromFilesystem () {
   }
 }
 
+function getFamilyFromReport () {
+  const originalExclude = process.report.excludeNetwork
+  process.report.excludeNetwork = true
+  const report = process.report.getReport()
+  process.report.excludeNetwork = originalExclude
+  if (report.header?.glibcVersionRuntime) {
+    family = 'glibc'
+  } else if (Array.isArray(report.sharedObjects) && report.sharedObjects.some(isMusl)) {
+    family = 'musl'
+  } else {
+    family = null
+  }
+  return family
+}
+
 let family
 function libc (osName) {
   if (osName !== 'linux') {
@@ -38,17 +53,7 @@ function libc (osName) {
   if (family === undefined) {
     family = getFamilyFromFilesystem()
     if (family === undefined) {
-      const originalExclude = process.report.excludeNetwork
-      process.report.excludeNetwork = true
-      const report = process.report.getReport()
-      process.report.excludeNetwork = originalExclude
-      if (report.header?.glibcVersionRuntime) {
-        family = 'glibc'
-      } else if (Array.isArray(report.sharedObjects) && report.sharedObjects.some(isMusl)) {
-        family = 'musl'
-      } else {
-        family = null
-      }
+      family = getFamilyFromReport()
     }
   }
   return family

test/check-platform.js

@@ -98,27 +98,44 @@ t.test('libc', (t) => {
   let PLATFORM = 'linux'
   let REPORT = {}
   let readFileSync
+  let noCache = true
+
+  function withCache (cb) {
+    noCache = false
+    cb()
+    noCache = true
+    withoutLibcCache()
+  }
 
   function withoutLibcCache () {
     readFileSync = () => {
       throw new Error('File not found')
     }
-    noCacheChckPtfm = (...args) => {
-      const original = t.mock('..', {
-        '../lib/current-env': t.mock('../lib/current-env', {
-          'node:fs': {
-            readFileSync,
+    const original = t.mock('..', {
+      '../lib/current-env': t.mock('../lib/current-env', {
+        'node:fs': {
+          readFileSync: () => {
+            return readFileSync()
           },
-          'node:process': {
-            platform: PLATFORM,
-            report: {
-              getReport: () => REPORT,
-            },
+        },
+        'node:process': Object.defineProperty({
+          report: {
+            getReport: () => REPORT,
           },
+        }, 'platform', {
+          enumerable: true,
+          get: () => PLATFORM,
         }),
-      }).checkPlatform
-      withoutLibcCache()
-      return original(...args)
+      }),
+    }).checkPlatform
+    noCacheChckPtfm = (...args) => {
+      try {
+        original(...args)
+      } finally {
+        if (noCache) {
+          withoutLibcCache()
+        }
+      }
     }
   }
 
@@ -137,8 +154,16 @@ t.test('libc', (t) => {
   t.test('glibc', (t) => {
     PLATFORM = 'linux'
 
-    readFileSync = () => 'this ldd file contains GNU C Library'
-    t.doesNotThrow(() => noCacheChckPtfm({ libc: 'glibc' }), 'allows glibc on glibc from ldd file')
+    withCache(() => {
+      readFileSync = () => 'this ldd file contains GNU C Library'
+      t.doesNotThrow(() => noCacheChckPtfm({ libc: 'glibc' }),
+        'allows glibc on glibc from ldd file')
+
+      readFileSync = () => {
+        throw new Error('File not found')
+      }
+      t.doesNotThrow(() => noCacheChckPtfm({ libc: 'glibc' }), 'allows glibc from ldd file cache')
+    })
 
     REPORT = {}
     t.throws(() => noCacheChckPtfm({ libc: 'glibc' }), { code: 'EBADPLATFORM' },
@@ -148,8 +173,13 @@ t.test('libc', (t) => {
     t.throws(() => noCacheChckPtfm({ libc: 'glibc' }), { code: 'EBADPLATFORM' },
       'fails when header is missing glibcVersionRuntime property')
 
-    REPORT = { header: { glibcVersionRuntime: '1' } }
-    t.doesNotThrow(() => noCacheChckPtfm({ libc: 'glibc' }), 'allows glibc on glibc')
+    withCache(() => {
+      REPORT = { header: { glibcVersionRuntime: '1' } }
+      t.doesNotThrow(() => noCacheChckPtfm({ libc: 'glibc' }), 'allows glibc on glibc')
+
+      REPORT = {}
+      t.doesNotThrow(() => noCacheChckPtfm({ libc: 'glibc' }), 'allows glibc from report cache')
+    })
 
     readFileSync = () => 'this ldd file is unsupported'
     t.throws(() => noCacheChckPtfm({ libc: 'glibc' }), { code: 'EBADPLATFORM' },