fix(@xen-orchestra/backups): tests

@xen-orchestra/backups/_cleanVm.test.js

@@ -221,7 +221,7 @@ test('it merges delta of non destroyed chain', async () => {
     loggued.push(message)
   }
   await adapter.cleanVm(rootPath, { remove: true, logInfo, logWarn: logInfo, lock: false })
-  assert.equal(loggued[0], `incorrect backup size in metadata`)
+  assert.equal(loggued[0], `unexpected number of entries in backup cache`)
 
   loggued = []
   await adapter.cleanVm(rootPath, { remove: true, merge: true, logInfo, logWarn: () => {}, lock: false })
@@ -378,7 +378,19 @@ describe('tests multiple combination ', () => {
             ],
           })
         )
-
+        if (!useAlias && vhdMode === 'directory') {
+          try {
+            await adapter.cleanVm(rootPath, { remove: true, merge: true, logWarn: () => {}, lock: false })
+          } catch (err) {
+            assert.strictEqual(
+              err.code,
+              'NOT_SUPPORTED',
+              'Merging directory without alias should raise a not supported error'
+            )
+            return
+          }
+          assert.strictEqual(true, false, 'Merging directory without alias should raise an error')
+        }
         await adapter.cleanVm(rootPath, { remove: true, merge: true, logWarn: () => {}, lock: false })
 
         const metadata = JSON.parse(await handler.readFile(`${rootPath}/metadata.json`))

CHANGELOG.unreleased.md

@@ -28,5 +28,7 @@
 <!--packages-start-->
 
 - @xen-orchestra/backups patch
+- vhd-lib patch
 - xo-server patch
+
 <!--packages-end-->

packages/vhd-lib/merge.js

@@ -132,6 +132,13 @@ class Merger {
 
     // merging vhdFile must not be concurrently with the potential block reordering after a change
     this.#mergeBlockConcurrency = parentIsVhdDirectory && childIsVhdDirectory ? this.#mergeBlockConcurrency : 1
+
+    if (parentIsVhdDirectory && !isVhdAlias(this.#parentPath)) {
+      const error = new Error("can't merge vhd directories without using alias")
+      error.code = 'NOT_SUPPORTED'
+      throw error
+    }
+
     if (this.#state === undefined) {
       // merge should be along a vhd chain
       assert.strictEqual(UUID.stringify(childVhd.header.parentUuid), UUID.stringify(parentVhd.footer.uuid))