diff --git a/package.json b/package.json index fc01e53a3..92f59a344 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,6 @@ "jest": { "collectCoverage": true, "moduleNameMapper": { - "^.": "./src", "^(@vates/[^/]+)": "$1/src", "^(@xen-orchestra/[^/]+)": "$1/src", "^(value-matcher)": "$1/src", diff --git a/packages/xo-vmdk-to-vhd/src/ova.integ.spec.js b/packages/xo-vmdk-to-vhd/src/ova.integ.spec.js index ee79f2244..010a52c8e 100644 --- a/packages/xo-vmdk-to-vhd/src/ova.integ.spec.js +++ b/packages/xo-vmdk-to-vhd/src/ova.integ.spec.js @@ -74,11 +74,19 @@ test('An ova file is parsed correctly', async () => { expect(data).toEqual(expectedResult) }) +function arrayToBuffer(array) { + const output = new DataView(new ArrayBuffer(array.length * 4)) + array.forEach((e, i) => { + output.setUint32(i * 4, e, true) + }) + return output.buffer +} + const expectedResult = { tables: { [vmdkFileName]: { - grainFileOffsetList: [65536, 115712], - grainLogicalAddressList: [0, 65536], + grainFileOffsetList: arrayToBuffer([65536, 115712]), + grainLogicalAddressList: arrayToBuffer([0, 65536]), }, }, disks: { diff --git a/packages/xo-vmdk-to-vhd/src/vmdk-read.integ.spec.js b/packages/xo-vmdk-to-vhd/src/vmdk-read.integ.spec.js index d6c5d8978..6244703bd 100644 --- a/packages/xo-vmdk-to-vhd/src/vmdk-read.integ.spec.js +++ b/packages/xo-vmdk-to-vhd/src/vmdk-read.integ.spec.js @@ -25,6 +25,15 @@ function createFileAccessor(file) { } } +function bufferToArray(buffer) { + const view = new DataView(buffer) + const res = [] + for (let i = 0; i < buffer.byteLength; i += 4) { + res.push(view.getUint32(i, true)) + } + return res +} + jest.setTimeout(10000) const initialDir = process.cwd() @@ -48,8 +57,8 @@ test('VMDKDirectParser reads OK', async () => { const data = await readVmdkGrainTable(createFileAccessor(fileName)) const parser = new VMDKDirectParser( createReadStream(fileName), - data.grainLogicalAddressList, - data.grainFileOffsetList + bufferToArray(data.grainLogicalAddressList), + bufferToArray(data.grainFileOffsetList) ) const header = await parser.readHeader() const harvested = []