Refactor how the hypervisor is selected

cross-platform-actions · Jul 23, 2023 · b119483 · b119483
1 parent 61b3a55
commit b119483
Show file tree

Hide file tree

Showing 21 changed files with 211 additions and 178 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/spec/operating_systems/freebsd/freebsd.spec.ts b/spec/operating_systems/freebsd/freebsd.spec.ts
@@ -45,9 +45,9 @@ describe('FreeBSD OperatingSystem', () => {
 
   let host = new MockHost()
   let osKind = os.Kind.for('freebsd')
-  let architecture = arch.Architecture.for(arch.Kind.x86_64, host, osKind)
   let vmm = host.hypervisor
-  let freebsd = new FreeBsd(architecture, '0.0.0', vmm)
+  let architecture = arch.Architecture.for(arch.Kind.x86_64, host, osKind, vmm)
+  let freebsd = new FreeBsd(architecture, '0.0.0')
   let hypervisorDirectory = 'hypervisor/directory'
   let resourcesDirectory = 'resources/directory'
   let firmwareDirectory = 'firmware/directory'
@@ -95,7 +95,13 @@ describe('FreeBSD OperatingSystem', () => {
 
     describe('when the given hypervisor is Xhyve', () => {
       it('creates a virtual machine using the Xhyve hypervisor', () => {
-        let freebsd = new FreeBsd(architecture, '0.0.0', new hypervisor.Xhyve())
+        let archObject = arch.Architecture.for(
+          arch.Kind.x86_64,
+          host,
+          osKind,
+          new hypervisor.Xhyve()
+        )
+        let freebsd = new FreeBsd(archObject, '0.0.0')
         const vm = freebsd.createVirtualMachine(
           hypervisorDirectory,
           resourcesDirectory,
@@ -110,7 +116,13 @@ describe('FreeBSD OperatingSystem', () => {
 
     describe('when the given hypervisor is Qemu', () => {
       it('creates a virtual machine using the Qemu hypervisor', () => {
-        let freebsd = new FreeBsd(architecture, '0.0.0', new hypervisor.Qemu())
+        let archObject = arch.Architecture.for(
+          arch.Kind.x86_64,
+          host,
+          osKind,
+          new hypervisor.Qemu()
+        )
+        let freebsd = new FreeBsd(archObject, '0.0.0')
         const vm = freebsd.createVirtualMachine(
           hypervisorDirectory,
           resourcesDirectory,

diff --git a/spec/operating_systems/freebsd/qemu_vm.spec.ts b/spec/operating_systems/freebsd/qemu_vm.spec.ts
@@ -11,7 +11,12 @@ describe('FreeBSD QemuVm', () => {
   let ssHostPort = 1234
 
   let osKind = os.Kind.for('freebsd')
-  let architecture = arch.Architecture.for(arch.Kind.x86_64, host, osKind)
+  let architecture = arch.Architecture.for(
+    arch.Kind.x86_64,
+    host,
+    osKind,
+    host.hypervisor
+  )
   let config = {
     memory: memory,
     cpuCount: cpuCount,