feat: update test

.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/index.2.test.js

@@ -18,18 +18,22 @@ const {
 
 describe('test/index.v2.test.js', () => {
   let cwd;
+  let needClean = true;
 
   afterEach(async () => {
-    await clean({ cwd });
-    if (process.platform === 'darwin') {
-      try {
-        await forceExitDaemon();
-      } catch (err) {
-        console.warn('force exit daemon error: %s', err.message);
+    if (needClean) {
+      await clean({ cwd, daemon: true });
+      if (process.platform === 'darwin') {
+        try {
+          await forceExitDaemon();
+        } catch (err) {
+          console.warn('force exit daemon error: %s', err.message);
+        }
+      } else {
+        await exitDaemon();
       }
-    } else {
-      await exitDaemon();
     }
+    needClean = true;
   });
 
   describe('update', () => {
@@ -223,9 +227,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,12 +251,14 @@ 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')));
+
+      // nydusd has been killed
+      needClean = false;
     });
   });
 

integration/workspaces.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,

packages/cli/lib/nydusd/nydusd_api.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 = '') {

packages/cli/test/package_lock.test.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/scripts.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 ],