feat: update test

Author: akitaSummer

.mocharc-integration.yml

@@ -10,3 +10,4 @@ require:
   - intelli-espower-loader
 full-trace: true
 exit: true
+parallel: false

.mocharc.yml

@@ -10,3 +10,4 @@ require:
   - intelli-espower-loader
 full-trace: true
 exit: true
+parallel: false

integration/fixtures/not-exist-lock-file/package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "canvas": "2.9.0"
+  }
+}

integration/fixtures/utils/pids.js

@@ -3,6 +3,7 @@
 const fs = require('node:fs/promises');
 const path = require('node:path');
 const assert = require('node:assert');
+const os = require('node:os');
 const coffee = require('coffee');
 const semver = require('semver');
 const execa = require('execa');
@@ -20,16 +21,25 @@ describe('test/index.v2.test.js', () => {
   let cwd;
 
   afterEach(async () => {
-    await clean({ cwd });
+    try {
+      await clean({ cwd, daemon: true });
+    } catch (e) {
+      console.warn('clean error: ', e);
+    }
     if (process.platform === 'darwin') {
       try {
         await forceExitDaemon();
       } catch (err) {
         console.warn('force exit daemon error: %s', err.message);
       }
     } else {
-      await exitDaemon();
+      try {
+        await exitDaemon();
+      } catch (err) {
+        console.warn('exit daemon error: %s', err.message);
+      }
     }
+
   });
 
   describe('update', () => {
@@ -125,8 +135,10 @@ describe('test/index.v2.test.js', () => {
       .end();
 
     await assert.doesNotReject(fs.stat(path.join(cwd, 'node_modules/react-jsx-parser/package.json')));
-    const { stdout } = await execa.command('mount', { stdio: 'pipe' });
-    assert(stdout.indexOf(cwd) > 0);
+    if (os.type() === 'Darwin') {
+      const { stdout } = await execa.command('mount', { stdio: 'pipe' });
+      assert(stdout.indexOf(cwd) > 0);
+    }
     assert(require(path.join(cwd, 'node_modules/react-jsx-parser/package.json')).version === '1.29.0');
   });
 
@@ -205,7 +217,7 @@ describe('test/index.v2.test.js', () => {
   });
 
 
-  describe('deamon', async () => {
+  describe.only('deamon', async () => {
     it('should work', async () => {
       cwd = path.join(__dirname, './fixtures/esbuild');
       await coffee
@@ -223,9 +235,8 @@ describe('test/index.v2.test.js', () => {
       assert.strictEqual(dirs.filter(dir => dir.includes('esbuild')).length, 2);
       await assert.doesNotReject(fs.stat(path.join(cwd, 'node_modules/esbuild')));
       assert.strictEqual(require(path.join(cwd, 'node_modules', 'esbuild/package.json')).version, '0.15.14');
-      const nodeModulesDir = path.join(cwd, 'node_modules');
 
-      await execa.command(`umount -f ${nodeModulesDir}`);
+      await execa.command('killall -9 nydusd');
       await setTimeoutPromise(20000);
       assert.strictEqual(require(path.join(cwd, 'node_modules', 'esbuild/package.json')).version, '0.15.14');
     });
@@ -248,9 +259,8 @@ describe('test/index.v2.test.js', () => {
       assert.strictEqual(dirs.filter(dir => dir.includes('esbuild')).length, 2);
       await assert.doesNotReject(fs.stat(path.join(cwd, 'node_modules/esbuild')));
       assert.strictEqual(require(path.join(cwd, 'node_modules', 'esbuild/package.json')).version, '0.15.14');
-      const nodeModulesDir = path.join(cwd, 'node_modules');
 
-      await execa.command(`umount -f ${nodeModulesDir}`);
+      await execa.command('killall -9 nydusd');
       await setTimeoutPromise(20000);
 
       await assert.rejects(fs.stat(path.join(cwd, 'node_modules', 'esbuild/package.json')));

integration/index.2.test.js

@@ -16,9 +16,13 @@ const {
 describe('test/index.test.js', () => {
   let fixture;
   afterEach(async () => {
-    await clean({
-      cwd: fixture,
-    });
+    try {
+      await clean({
+        cwd: fixture,
+      });
+    } catch (e) {
+      console.warn('clean error: ', e);
+    }
     if (process.platform === 'darwin') {
       await forceExitDaemon();
     } else {

integration/index.test.js

@@ -17,10 +17,14 @@ describe('test/workspaces.test.js', () => {
 
   it('should install lodash successfully', async () => {
     cwd = path.join(__dirname, './fixtures/workspaces');
-    await clean({
-      cwd,
-      force: true,
-    });
+    try {
+      await clean({
+        cwd,
+        force: true,
+      });
+    } catch (e) {
+      console.warn('clean error: ', e);
+    }
     await install({
       nydusMode: 'FUSE',
       cwd,

integration/workspaces.test.js

@@ -145,12 +145,12 @@ async function checkDaemon() {
 // 优雅退出 nydusd daemon
 async function exitDaemon() {
   try {
-    await killDeamon();
     await urllib.request(`${daemonUrl}/exit`, {
       method: 'PUT',
       socketPath,
       dataType: 'json',
     });
+    await killDeamon();
   } catch (e) {
     // ignore, nydusd quits with error, but it's ok
     e.message = 'exit nydusd faield: ' + e.message;
@@ -170,15 +170,6 @@ async function forceExitDaemon() {
     e.message = 'umount nydusd mnt failed: ' + e.message;
     console.warn(e);
   }
-
-  try {
-    await killDeamon();
-    await execa.command('killall -9 nydusd');
-  } catch (e) {
-    // ignore, nydusd quits with error, but it's ok
-    e.message = 'exit nydusd failed: ' + e.message;
-    console.warn(e);
-  }
 }
 
 async function mount(mountpoint, cwd, bootstrap = '') {
@@ -218,6 +209,10 @@ async function mount(mountpoint, cwd, bootstrap = '') {
   });
   debug('mount result: %j', result);
 
+  if (os.type() === 'Darwin') {
+    await new Promise(resolve => setTimeout(resolve, 1000));
+  }
+
   return config;
 }
 

packages/cli/lib/nydusd/nydusd_api.js

@@ -5,8 +5,7 @@ const path = require('node:path');
 const fs = require('node:fs/promises');
 const mm = require('mm');
 const PackageLock = require('../lib/package_lock').PackageLock;
-const { install } = require('../lib');
-const httpclient = require('../lib/httpclient');
+const { generatePackageLock } = require('../lib/util');
 const nydusd = require('../lib/nydusd');
 const downloadDependency = require('../lib/download_dependency');
 
@@ -68,15 +67,10 @@ describe('test/package_lock.test.js', () => {
       mm.restore();
     });
 
-    it('should run all project installation scripts', async () => {
+    it('should generate package-lock.json', async () => {
       fixture = path.join(__dirname, './fixtures/not-exist-lock-file');
-      const pkg = require(path.join(fixture, 'package.json'));
-      await install({
-        httpclient,
-        pkg,
-        cwd: fixture,
-        console: global.console,
-      });
+
+      await generatePackageLock(fixture);
       await fs.stat(path.join(fixture, 'package-lock.json'));
     });
   });

packages/cli/test/package_lock.test.js

@@ -163,6 +163,8 @@ describe('test/scripts.test.js', () => {
         mm(process.env, NYDUS_CSI_ROOT_ENV, 'true');
         mm(process, 'cwd', () => fixtures);
         mm(nydusd, 'startNydusFs', async () => { });
+        mm(util, 'ensureAccess', async () => { });
+        mm(util, 'storePackageLock', async () => { });
         mm(downloadDependency, 'download', async () => {
           return {
             depsTree: [ 1 ],