summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJared Weyer <v-jaredweyer@microsoft.com>2023-01-04 09:03:18 -0800
committerJared Weyer <v-jaredweyer@microsoft.com>2023-01-04 09:03:18 -0800
commit815d074bc7ab6c6ce44be9a56c61a8fb9f2650ac (patch)
tree42b585716bed435edb3a5abf4c5ea299ed12e2b0
parent89b947c0cd6f8801f7fa1aad3a7dbca553573c24 (diff)
downloadohai-815d074bc7ab6c6ce44be9a56c61a8fb9f2650ac.tar.gz
cookstyle changes
Signed-off-by: Jared Weyer <v-jaredweyer@microsoft.com>
-rw-r--r--lib/ohai/plugins/darwin/virtualization.rb5
-rw-r--r--spec/unit/plugins/darwin/virtualization_spec.rb2
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/ohai/plugins/darwin/virtualization.rb b/lib/ohai/plugins/darwin/virtualization.rb
index d25f646b..4ccdc19d 100644
--- a/lib/ohai/plugins/darwin/virtualization.rb
+++ b/lib/ohai/plugins/darwin/virtualization.rb
@@ -77,15 +77,14 @@ Ohai.plugin(:Virtualization) do
virtualization[:systems][:vmware] = "guest"
end
-
if ioreg_exists? && /pci1ab8,4000/.match?(shell_out("ioreg -l").stdout)
virtualization[:system] = "parallels"
virtualization[:role] = "guest"
virtualization[:systems][:parallels] = "guest"
- elsif prlctl_exists?
+ elsif prlctl_exists?
virtualization[:system] = "parallels"
virtualization[:role] = "host"
virtualization[:systems][:parallels] = "host"
end
end
-end
+end \ No newline at end of file
diff --git a/spec/unit/plugins/darwin/virtualization_spec.rb b/spec/unit/plugins/darwin/virtualization_spec.rb
index 4175d2e1..845d47f9 100644
--- a/spec/unit/plugins/darwin/virtualization_spec.rb
+++ b/spec/unit/plugins/darwin/virtualization_spec.rb
@@ -151,7 +151,7 @@ describe Ohai::System, "Darwin virtualization platform" do
expect(plugin[:virtualization][:role]).to eq("guest")
expect(plugin[:virtualization][:systems][:parallels]).to eq("guest")
end
-
+
it "sets parallels host if /usr/local/bin/prlctl exists, /usr/sbin/ioreg exists, and ioreg's output does not contain pci1ab8,4000" do
allow(plugin).to receive(:prlctl_exists?).and_return("/usr/local/bin/prlctl")
allow(plugin).to receive(:ioreg_exists?).and_return(true)