diff options
author | Tim Smith <tsmith@chef.io> | 2019-04-22 10:44:48 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-22 10:44:48 -0700 |
commit | 8c65304eb8f6a3bd107a7606b6a0e92e7ce7fc8f (patch) | |
tree | 60512c6471886218a4ad4a6f88fe079bac14b24b | |
parent | 3cbf90d12abb2fe11bc486b87449a98ea02988d2 (diff) | |
parent | 0ae9e21462d65b78d54493adc6b7bd57eaca144b (diff) | |
download | ohai-8c65304eb8f6a3bd107a7606b6a0e92e7ce7fc8f.tar.gz |
Merge pull request #1349 from burtlo/fix/require-spec_helper
Replaces require_relative with require
139 files changed, 140 insertions, 140 deletions
diff --git a/spec/functional/application_spec.rb b/spec/functional/application_spec.rb index ff963d56..a49aea05 100644 --- a/spec/functional/application_spec.rb +++ b/spec/functional/application_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../spec_helper" +require "spec_helper" require "ohai/application" RSpec.describe "Ohai::Application" do diff --git a/spec/functional/loader_spec.rb b/spec/functional/loader_spec.rb index 64024e68..033f3271 100644 --- a/spec/functional/loader_spec.rb +++ b/spec/functional/loader_spec.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require_relative "../spec_helper" +require "spec_helper" RSpec.describe "Ohai::Loader" do let(:loader) { Ohai::Loader.new(Ohai::System.new) } diff --git a/spec/functional/plugins/powershell_spec.rb b/spec/functional/plugins/powershell_spec.rb index 766449c6..a4fa4d4b 100644 --- a/spec/functional/plugins/powershell_spec.rb +++ b/spec/functional/plugins/powershell_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "languages plugin" do VERSION_MATCHING_REGEX = /^(?:[\d]+\.)+[\d]+$/.freeze diff --git a/spec/functional/plugins/root_group_spec.rb b/spec/functional/plugins/root_group_spec.rb index 6bf05f2f..f52915a3 100644 --- a/spec/functional/plugins/root_group_spec.rb +++ b/spec/functional/plugins/root_group_spec.rb @@ -18,7 +18,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "root_group plugin" do let(:plugin) { get_plugin("root_group") } diff --git a/spec/functional/plugins/windows/uptime_spec.rb b/spec/functional/plugins/windows/uptime_spec.rb index c613c1f6..c8ff75de 100644 --- a/spec/functional/plugins/windows/uptime_spec.rb +++ b/spec/functional/plugins/windows/uptime_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Windows plugin uptime" do diff --git a/spec/ohai_spec.rb b/spec/ohai_spec.rb index f3de6b63..e57f7a39 100644 --- a/spec/ohai_spec.rb +++ b/spec/ohai_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "spec_helper.rb" +require "spec_helper" describe Ohai do diff --git a/spec/unit/application_spec.rb b/spec/unit/application_spec.rb index 831fa9c4..765287b7 100644 --- a/spec/unit/application_spec.rb +++ b/spec/unit/application_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../spec_helper" +require "spec_helper" require "ohai/application" RSpec.describe "Ohai::Application" do diff --git a/spec/unit/config_spec.rb b/spec/unit/config_spec.rb index 63341021..17ffcebd 100644 --- a/spec/unit/config_spec.rb +++ b/spec/unit/config_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../spec_helper" +require "spec_helper" require "ohai/config" RSpec.describe Ohai::Config do diff --git a/spec/unit/dsl/plugin_spec.rb b/spec/unit/dsl/plugin_spec.rb index 1ba70623..ff5289ac 100644 --- a/spec/unit/dsl/plugin_spec.rb +++ b/spec/unit/dsl/plugin_spec.rb @@ -17,7 +17,7 @@ # limitations under the License # -require_relative "../../spec_helper.rb" +require "spec_helper" shared_examples "Ohai::DSL::Plugin" do context "#initialize" do diff --git a/spec/unit/hints_spec.rb b/spec/unit/hints_spec.rb index 07c1651f..2296e810 100644 --- a/spec/unit/hints_spec.rb +++ b/spec/unit/hints_spec.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require_relative "../spec_helper.rb" +require "spec_helper" describe "Ohai::Hints" do # We are using the plugins directory infrastructure to test hints diff --git a/spec/unit/loader_spec.rb b/spec/unit/loader_spec.rb index d752531d..c714024d 100644 --- a/spec/unit/loader_spec.rb +++ b/spec/unit/loader_spec.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require_relative "../spec_helper.rb" +require "spec_helper" describe Ohai::Loader do extend IntegrationSupport diff --git a/spec/unit/mixin/azure_metadata_spec.rb b/spec/unit/mixin/azure_metadata_spec.rb index cc216c4b..50f6ecd0 100644 --- a/spec/unit/mixin/azure_metadata_spec.rb +++ b/spec/unit/mixin/azure_metadata_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" require "ohai/mixin/azure_metadata" describe Ohai::Mixin::AzureMetadata do diff --git a/spec/unit/mixin/command_spec.rb b/spec/unit/mixin/command_spec.rb index 59a9475b..6e0d9cf0 100644 --- a/spec/unit/mixin/command_spec.rb +++ b/spec/unit/mixin/command_spec.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::Mixin::Command, "shell_out" do let(:cmd) { "sparkle-dream --version" } diff --git a/spec/unit/mixin/dmi_decode.rb b/spec/unit/mixin/dmi_decode.rb index 3cc881ed..dcd3698e 100644 --- a/spec/unit/mixin/dmi_decode.rb +++ b/spec/unit/mixin/dmi_decode.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" require "ohai/mixin/dmi_decode" describe Ohai::Mixin::DmiDecode, "guest_from_dmi_data" do diff --git a/spec/unit/mixin/ec2_metadata_spec.rb b/spec/unit/mixin/ec2_metadata_spec.rb index f9647179..88d3b5d8 100644 --- a/spec/unit/mixin/ec2_metadata_spec.rb +++ b/spec/unit/mixin/ec2_metadata_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" require "ohai/mixin/ec2_metadata" describe Ohai::Mixin::Ec2Metadata do diff --git a/spec/unit/mixin/softlayer_metadata_spec.rb b/spec/unit/mixin/softlayer_metadata_spec.rb index 97624ae3..d636b378 100644 --- a/spec/unit/mixin/softlayer_metadata_spec.rb +++ b/spec/unit/mixin/softlayer_metadata_spec.rb @@ -17,7 +17,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require_relative "../../spec_helper.rb" +require "spec_helper" require "ohai/mixin/softlayer_metadata" describe ::Ohai::Mixin::SoftlayerMetadata do diff --git a/spec/unit/plugin_config_spec.rb b/spec/unit/plugin_config_spec.rb index 8705a427..45c61c68 100644 --- a/spec/unit/plugin_config_spec.rb +++ b/spec/unit/plugin_config_spec.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require_relative "../spec_helper" +require "spec_helper" require "ohai/plugin_config" describe "Ohai::PluginConfig" do diff --git a/spec/unit/plugins/abort_spec.rb b/spec/unit/plugins/abort_spec.rb index 57eb0973..8384997c 100644 --- a/spec/unit/plugins/abort_spec.rb +++ b/spec/unit/plugins/abort_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" tmp = ENV["TMPDIR"] || ENV["TMP"] || ENV["TEMP"] || "/tmp" diff --git a/spec/unit/plugins/aix/cpu_spec.rb b/spec/unit/plugins/aix/cpu_spec.rb index f0ea1490..98150dfa 100644 --- a/spec/unit/plugins/aix/cpu_spec.rb +++ b/spec/unit/plugins/aix/cpu_spec.rb @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "AIX cpu plugin" do before(:each) do diff --git a/spec/unit/plugins/aix/filesystem_spec.rb b/spec/unit/plugins/aix/filesystem_spec.rb index aaa2b146..78fd0de1 100644 --- a/spec/unit/plugins/aix/filesystem_spec.rb +++ b/spec/unit/plugins/aix/filesystem_spec.rb @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "AIX filesystem plugin" do before(:each) do diff --git a/spec/unit/plugins/aix/hostname_spec.rb b/spec/unit/plugins/aix/hostname_spec.rb index 6f419d58..9600c956 100644 --- a/spec/unit/plugins/aix/hostname_spec.rb +++ b/spec/unit/plugins/aix/hostname_spec.rb @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "AIX hostname plugin" do before(:each) do diff --git a/spec/unit/plugins/aix/kernel_spec.rb b/spec/unit/plugins/aix/kernel_spec.rb index d0c0cded..686f8a56 100644 --- a/spec/unit/plugins/aix/kernel_spec.rb +++ b/spec/unit/plugins/aix/kernel_spec.rb @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "AIX kernel plugin" do before(:each) do diff --git a/spec/unit/plugins/aix/memory_spec.rb b/spec/unit/plugins/aix/memory_spec.rb index 92736445..232009dd 100644 --- a/spec/unit/plugins/aix/memory_spec.rb +++ b/spec/unit/plugins/aix/memory_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "AIX memory plugin" do before(:each) do diff --git a/spec/unit/plugins/aix/network_spec.rb b/spec/unit/plugins/aix/network_spec.rb index 5896a7b5..801e4f4e 100644 --- a/spec/unit/plugins/aix/network_spec.rb +++ b/spec/unit/plugins/aix/network_spec.rb @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "AIX network plugin" do diff --git a/spec/unit/plugins/aix/platform_spec.rb b/spec/unit/plugins/aix/platform_spec.rb index 10633443..c3e3e6fa 100644 --- a/spec/unit/plugins/aix/platform_spec.rb +++ b/spec/unit/plugins/aix/platform_spec.rb @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Aix plugin platform" do before(:each) do diff --git a/spec/unit/plugins/aix/uptime_spec.rb b/spec/unit/plugins/aix/uptime_spec.rb index d3cf47c8..b54bb4be 100644 --- a/spec/unit/plugins/aix/uptime_spec.rb +++ b/spec/unit/plugins/aix/uptime_spec.rb @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Aix plugin uptime" do diff --git a/spec/unit/plugins/aix/virtualization_spec.rb b/spec/unit/plugins/aix/virtualization_spec.rb index 1373f319..46add5c4 100644 --- a/spec/unit/plugins/aix/virtualization_spec.rb +++ b/spec/unit/plugins/aix/virtualization_spec.rb @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "AIX virtualization plugin" do diff --git a/spec/unit/plugins/azure_spec.rb b/spec/unit/plugins/azure_spec.rb index 8d041616..abddd25f 100644 --- a/spec/unit/plugins/azure_spec.rb +++ b/spec/unit/plugins/azure_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" require "open-uri" describe Ohai::System, "plugin azure" do diff --git a/spec/unit/plugins/bsd/filesystem_spec.rb b/spec/unit/plugins/bsd/filesystem_spec.rb index c64981d8..e3d8be5e 100644 --- a/spec/unit/plugins/bsd/filesystem_spec.rb +++ b/spec/unit/plugins/bsd/filesystem_spec.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "BSD filesystem plugin" do let(:plugin) { get_plugin("filesystem") } diff --git a/spec/unit/plugins/bsd/virtualization_spec.rb b/spec/unit/plugins/bsd/virtualization_spec.rb index e8922dd8..74e31e0f 100644 --- a/spec/unit/plugins/bsd/virtualization_spec.rb +++ b/spec/unit/plugins/bsd/virtualization_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "BSD virtualization plugin" do let(:plugin) { get_plugin("bsd/virtualization") } diff --git a/spec/unit/plugins/c_spec.rb b/spec/unit/plugins/c_spec.rb index 4395889c..4f0a4665 100644 --- a/spec/unit/plugins/c_spec.rb +++ b/spec/unit/plugins/c_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" C_GCC = <<~EOF.freeze Using built-in specs. diff --git a/spec/unit/plugins/chef_spec.rb b/spec/unit/plugins/chef_spec.rb index 773fa349..3fd779ac 100644 --- a/spec/unit/plugins/chef_spec.rb +++ b/spec/unit/plugins/chef_spec.rb @@ -19,7 +19,7 @@ # begin - require_relative "../../spec_helper.rb" + require "spec_helper" require "chef/version" describe Ohai::System, "plugin chef" do diff --git a/spec/unit/plugins/cloud_spec.rb b/spec/unit/plugins/cloud_spec.rb index e26205d4..5c9d25f0 100644 --- a/spec/unit/plugins/cloud_spec.rb +++ b/spec/unit/plugins/cloud_spec.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" require "ipaddr" describe "CloudAttrs object" do diff --git a/spec/unit/plugins/darwin/cpu_spec.rb b/spec/unit/plugins/darwin/cpu_spec.rb index a1c54e54..75461638 100644 --- a/spec/unit/plugins/darwin/cpu_spec.rb +++ b/spec/unit/plugins/darwin/cpu_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Darwin cpu plugin" do before(:each) do diff --git a/spec/unit/plugins/darwin/filesystem_spec.rb b/spec/unit/plugins/darwin/filesystem_spec.rb index a9ce95d4..df0c19fc 100644 --- a/spec/unit/plugins/darwin/filesystem_spec.rb +++ b/spec/unit/plugins/darwin/filesystem_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "darwin filesystem plugin" do let(:plugin) { get_plugin("filesystem") } diff --git a/spec/unit/plugins/darwin/hardware_spec.rb b/spec/unit/plugins/darwin/hardware_spec.rb index 5c456f19..41886cd0 100644 --- a/spec/unit/plugins/darwin/hardware_spec.rb +++ b/spec/unit/plugins/darwin/hardware_spec.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" -require_relative "hardware_system_profiler_output.rb" +require "spec_helper" +require_relative "hardware_system_profiler_output" describe Ohai::System, "Darwin hardware plugin", :unix_only do let(:plugin) { get_plugin("darwin/hardware") } diff --git a/spec/unit/plugins/darwin/hostname_spec.rb b/spec/unit/plugins/darwin/hostname_spec.rb index 05184b83..b0028936 100644 --- a/spec/unit/plugins/darwin/hostname_spec.rb +++ b/spec/unit/plugins/darwin/hostname_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Darwin hostname plugin" do before(:each) do diff --git a/spec/unit/plugins/darwin/kernel_spec.rb b/spec/unit/plugins/darwin/kernel_spec.rb index 901962ba..70d58815 100644 --- a/spec/unit/plugins/darwin/kernel_spec.rb +++ b/spec/unit/plugins/darwin/kernel_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Darwin kernel plugin" do before(:each) do diff --git a/spec/unit/plugins/darwin/memory_spec.rb b/spec/unit/plugins/darwin/memory_spec.rb index b4bdf907..07f6fa3e 100644 --- a/spec/unit/plugins/darwin/memory_spec.rb +++ b/spec/unit/plugins/darwin/memory_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Darwin Memory Plugin" do before(:each) do diff --git a/spec/unit/plugins/darwin/network_spec.rb b/spec/unit/plugins/darwin/network_spec.rb index 65300b9f..d076bc6b 100644 --- a/spec/unit/plugins/darwin/network_spec.rb +++ b/spec/unit/plugins/darwin/network_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Darwin Network Plugin" do before(:each) do diff --git a/spec/unit/plugins/darwin/platform_spec.rb b/spec/unit/plugins/darwin/platform_spec.rb index 2820caa0..96184212 100644 --- a/spec/unit/plugins/darwin/platform_spec.rb +++ b/spec/unit/plugins/darwin/platform_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Darwin plugin platform" do before(:each) do diff --git a/spec/unit/plugins/darwin/virtualization_spec.rb b/spec/unit/plugins/darwin/virtualization_spec.rb index 7b9fef2a..2fe3ad01 100644 --- a/spec/unit/plugins/darwin/virtualization_spec.rb +++ b/spec/unit/plugins/darwin/virtualization_spec.rb @@ -18,7 +18,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Darwin virtualization platform" do let(:plugin) { get_plugin("darwin/virtualization") } diff --git a/spec/unit/plugins/dmi_spec.rb b/spec/unit/plugins/dmi_spec.rb index f43e540e..fb5e6a5c 100644 --- a/spec/unit/plugins/dmi_spec.rb +++ b/spec/unit/plugins/dmi_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" # NOTE: These data lines must be prefixed with one or two tabs, not spaces. DMI_OUT = <<~EOS.freeze diff --git a/spec/unit/plugins/docker_spec.rb b/spec/unit/plugins/docker_spec.rb index 3b839636..fe7ceb4f 100644 --- a/spec/unit/plugins/docker_spec.rb +++ b/spec/unit/plugins/docker_spec.rb @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require_relative "../../spec_helper.rb" +require "spec_helper" docker_output = <<~EOF {"ID":"KZET:VDFN:2V2G:JS5Z:HAKO:SOGI:AFSZ:HDMT:GVEM:V2NT:DUSW:J3Z6","Containers":11,"ContainersRunning":0,"ContainersPaused":0,"ContainersStopped":11,"Images":30,"Driver":"overlay2","DriverStatus":[["Backing Filesystem","extfs"],["Supports d_type","true"],["Native Overlay Diff","true"]],"SystemStatus":null,"Plugins":{"Volume":["local"],"Network":["bridge","host","ipvlan","macvlan","null","overlay"],"Authorization":null,"Log":["awslogs","fluentd","gcplogs","gelf","journald","json-file","logentries","splunk","syslog"]},"MemoryLimit":true,"SwapLimit":true,"KernelMemory":true,"CpuCfsPeriod":true,"CpuCfsQuota":true,"CPUShares":true,"CPUSet":true,"IPv4Forwarding":true,"BridgeNfIptables":true,"BridgeNfIp6tables":true,"Debug":true,"NFd":21,"OomKillDisable":true,"NGoroutines":39,"SystemTime":"2018-02-15T19:12:40.214106068Z","LoggingDriver":"json-file","CgroupDriver":"cgroupfs","NEventsListener":2,"KernelVersion":"4.9.60-linuxkit-aufs","OperatingSystem":"Docker for Mac","OSType":"linux","Architecture":"x86_64","IndexServerAddress":"https://index.docker.io/v1/","RegistryConfig":{"AllowNondistributableArtifactsCIDRs":[],"AllowNondistributableArtifactsHostnames":[],"InsecureRegistryCIDRs":["127.0.0.0/8"],"IndexConfigs":{"docker.io":{"Name":"docker.io","Mirrors":[],"Secure":true,"Official":true}},"Mirrors":[]},"NCPU":4,"MemTotal":2095816704,"GenericResources":null,"DockerRootDir":"/var/lib/docker","HttpProxy":"docker.for.mac.http.internal:3128","HttpsProxy":"docker.for.mac.http.internal:3129","NoProxy":"","Name":"linuxkit-025000000001","Labels":[],"ExperimentalBuild":true,"ServerVersion":"17.12.0-ce","ClusterStore":"","ClusterAdvertise":"","Runtimes":{"runc":{"path":"docker-runc"}},"DefaultRuntime":"runc","Swarm":{"NodeID":"","NodeAddr":"","LocalNodeState":"inactive","ControlAvailable":false,"Error":"","RemoteManagers":null},"LiveRestoreEnabled":false,"Isolation":"","InitBinary":"docker-init","ContainerdCommit":{"ID":"89623f28b87a6004d4b785663257362d1658a729","Expected":"89623f28b87a6004d4b785663257362d1658a729"},"RuncCommit":{"ID":"b2567b37d7b75eb4cf325b77297b140ea686ce8f","Expected":"b2567b37d7b75eb4cf325b77297b140ea686ce8f"},"InitCommit":{"ID":"949e6fa","Expected":"949e6fa"},"SecurityOptions":["name=seccomp,profile=default"]} diff --git a/spec/unit/plugins/ec2_spec.rb b/spec/unit/plugins/ec2_spec.rb index 6103d1a7..b94857e8 100644 --- a/spec/unit/plugins/ec2_spec.rb +++ b/spec/unit/plugins/ec2_spec.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" require "open-uri" require "base64" diff --git a/spec/unit/plugins/elixir_spec.rb b/spec/unit/plugins/elixir_spec.rb index b038bd56..35c46490 100644 --- a/spec/unit/plugins/elixir_spec.rb +++ b/spec/unit/plugins/elixir_spec.rb @@ -14,7 +14,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin elixir" do let(:plugin) { get_plugin("elixir") } diff --git a/spec/unit/plugins/erlang_spec.rb b/spec/unit/plugins/erlang_spec.rb index 78e16446..f10b8b89 100644 --- a/spec/unit/plugins/erlang_spec.rb +++ b/spec/unit/plugins/erlang_spec.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin erlang" do let(:plugin) { get_plugin("erlang") } diff --git a/spec/unit/plugins/eucalyptus_spec.rb b/spec/unit/plugins/eucalyptus_spec.rb index a21c203b..a9d7ed52 100644 --- a/spec/unit/plugins/eucalyptus_spec.rb +++ b/spec/unit/plugins/eucalyptus_spec.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" require "open-uri" describe Ohai::System, "plugin eucalyptus" do diff --git a/spec/unit/plugins/fail_spec.rb b/spec/unit/plugins/fail_spec.rb index 85fb28b3..00ee8ee3 100644 --- a/spec/unit/plugins/fail_spec.rb +++ b/spec/unit/plugins/fail_spec.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" tmp = ENV["TMPDIR"] || ENV["TMP"] || ENV["TEMP"] || "/tmp" diff --git a/spec/unit/plugins/freebsd/cpu_spec.rb b/spec/unit/plugins/freebsd/cpu_spec.rb index 9f96f33b..b4354904 100644 --- a/spec/unit/plugins/freebsd/cpu_spec.rb +++ b/spec/unit/plugins/freebsd/cpu_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "FreeBSD cpu plugin on FreeBSD >=10.2" do before(:each) do diff --git a/spec/unit/plugins/freebsd/hostname_spec.rb b/spec/unit/plugins/freebsd/hostname_spec.rb index 2f96c4ed..e0cf0012 100644 --- a/spec/unit/plugins/freebsd/hostname_spec.rb +++ b/spec/unit/plugins/freebsd/hostname_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "FreeBSD hostname plugin" do before(:each) do diff --git a/spec/unit/plugins/freebsd/kernel_spec.rb b/spec/unit/plugins/freebsd/kernel_spec.rb index d79379db..59c210c9 100644 --- a/spec/unit/plugins/freebsd/kernel_spec.rb +++ b/spec/unit/plugins/freebsd/kernel_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "FreeBSD kernel plugin" do before(:each) do diff --git a/spec/unit/plugins/freebsd/platform_spec.rb b/spec/unit/plugins/freebsd/platform_spec.rb index fddf01b3..42719fdc 100644 --- a/spec/unit/plugins/freebsd/platform_spec.rb +++ b/spec/unit/plugins/freebsd/platform_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "FreeBSD plugin platform" do before(:each) do diff --git a/spec/unit/plugins/gce_spec.rb b/spec/unit/plugins/gce_spec.rb index e769a9d2..0e015e35 100644 --- a/spec/unit/plugins/gce_spec.rb +++ b/spec/unit/plugins/gce_spec.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" require "open-uri" describe Ohai::System, "plugin gce" do diff --git a/spec/unit/plugins/go_spec.rb b/spec/unit/plugins/go_spec.rb index 86d018c2..1aeee50e 100644 --- a/spec/unit/plugins/go_spec.rb +++ b/spec/unit/plugins/go_spec.rb @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin go" do let(:plugin) { get_plugin("go") } diff --git a/spec/unit/plugins/groovy_spec.rb b/spec/unit/plugins/groovy_spec.rb index 3deed839..6178612d 100644 --- a/spec/unit/plugins/groovy_spec.rb +++ b/spec/unit/plugins/groovy_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin groovy" do let(:plugin) { get_plugin("groovy") } diff --git a/spec/unit/plugins/haskell_spec.rb b/spec/unit/plugins/haskell_spec.rb index e68aaf76..54658513 100644 --- a/spec/unit/plugins/haskell_spec.rb +++ b/spec/unit/plugins/haskell_spec.rb @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin haskell" do diff --git a/spec/unit/plugins/hostname_spec.rb b/spec/unit/plugins/hostname_spec.rb index c4523434..97cecf4f 100644 --- a/spec/unit/plugins/hostname_spec.rb +++ b/spec/unit/plugins/hostname_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" require "wmi-lite/wmi" require "socket" diff --git a/spec/unit/plugins/init_package_spec.rb b/spec/unit/plugins/init_package_spec.rb index 4cf597e1..fa72a0c9 100644 --- a/spec/unit/plugins/init_package_spec.rb +++ b/spec/unit/plugins/init_package_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Init package" do let(:plugin) do diff --git a/spec/unit/plugins/java_spec.rb b/spec/unit/plugins/java_spec.rb index 148eab56..9927eaf2 100644 --- a/spec/unit/plugins/java_spec.rb +++ b/spec/unit/plugins/java_spec.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin java (Java5 Client VM)" do let(:plugin) { get_plugin("java") } diff --git a/spec/unit/plugins/joyent_spec.rb b/spec/unit/plugins/joyent_spec.rb index 6e8f17c8..b4cd1c5f 100644 --- a/spec/unit/plugins/joyent_spec.rb +++ b/spec/unit/plugins/joyent_spec.rb @@ -14,7 +14,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin joyent" do let(:plugin) { get_plugin("joyent") } diff --git a/spec/unit/plugins/kernel_spec.rb b/spec/unit/plugins/kernel_spec.rb index 8e25975e..5cd8e2c5 100644 --- a/spec/unit/plugins/kernel_spec.rb +++ b/spec/unit/plugins/kernel_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin kernel" do before(:each) do diff --git a/spec/unit/plugins/linode_spec.rb b/spec/unit/plugins/linode_spec.rb index 866a6ba2..75d1a933 100644 --- a/spec/unit/plugins/linode_spec.rb +++ b/spec/unit/plugins/linode_spec.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin linode" do let(:plugin) { get_plugin("linode") } diff --git a/spec/unit/plugins/linux/block_device_spec.rb b/spec/unit/plugins/linux/block_device_spec.rb index 0ae45036..888b3c4b 100644 --- a/spec/unit/plugins/linux/block_device_spec.rb +++ b/spec/unit/plugins/linux/block_device_spec.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Linux Block Device Plugin" do DISKS = { diff --git a/spec/unit/plugins/linux/cpu_spec.rb b/spec/unit/plugins/linux/cpu_spec.rb index badd3271..9611ab33 100644 --- a/spec/unit/plugins/linux/cpu_spec.rb +++ b/spec/unit/plugins/linux/cpu_spec.rb @@ -17,7 +17,7 @@ # require "tempfile" -require_relative "../../../spec_helper.rb" +require "spec_helper" shared_examples "Common cpu info" do |total_cpu, real_cpu| describe "cpu" do diff --git a/spec/unit/plugins/linux/filesystem_spec.rb b/spec/unit/plugins/linux/filesystem_spec.rb index dac7eee8..e3e7b380 100644 --- a/spec/unit/plugins/linux/filesystem_spec.rb +++ b/spec/unit/plugins/linux/filesystem_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Linux filesystem plugin" do let(:plugin) { get_plugin("filesystem") } diff --git a/spec/unit/plugins/linux/fips_spec.rb b/spec/unit/plugins/linux/fips_spec.rb index dc4e1fe6..62340a6f 100644 --- a/spec/unit/plugins/linux/fips_spec.rb +++ b/spec/unit/plugins/linux/fips_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" require "openssl" describe Ohai::System, "plugin fips" do diff --git a/spec/unit/plugins/linux/hostname_spec.rb b/spec/unit/plugins/linux/hostname_spec.rb index b81d77e0..fcf4abec 100644 --- a/spec/unit/plugins/linux/hostname_spec.rb +++ b/spec/unit/plugins/linux/hostname_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Linux hostname plugin" do before(:each) do diff --git a/spec/unit/plugins/linux/hostnamectl_spec.rb b/spec/unit/plugins/linux/hostnamectl_spec.rb index 774cdb88..799bff82 100644 --- a/spec/unit/plugins/linux/hostnamectl_spec.rb +++ b/spec/unit/plugins/linux/hostnamectl_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Linux hostnamectl plugin" do let(:plugin) { get_plugin("linux/hostnamectl") } diff --git a/spec/unit/plugins/linux/kernel_spec.rb b/spec/unit/plugins/linux/kernel_spec.rb index ff3591da..241adc05 100644 --- a/spec/unit/plugins/linux/kernel_spec.rb +++ b/spec/unit/plugins/linux/kernel_spec.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Linux kernel plugin" do before(:each) do diff --git a/spec/unit/plugins/linux/lsb_spec.rb b/spec/unit/plugins/linux/lsb_spec.rb index 7535be33..eab7a1ab 100644 --- a/spec/unit/plugins/linux/lsb_spec.rb +++ b/spec/unit/plugins/linux/lsb_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" # We do not alter case for lsb attributes and consume them as provided diff --git a/spec/unit/plugins/linux/lspci_spec.rb b/spec/unit/plugins/linux/lspci_spec.rb index bcf49c93..eaebf895 100644 --- a/spec/unit/plugins/linux/lspci_spec.rb +++ b/spec/unit/plugins/linux/lspci_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Linux lspci plugin" do let(:plugin) { get_plugin("linux/lspci") } diff --git a/spec/unit/plugins/linux/machineid_spec.rb b/spec/unit/plugins/linux/machineid_spec.rb index 3c601ac2..b953f4d5 100644 --- a/spec/unit/plugins/linux/machineid_spec.rb +++ b/spec/unit/plugins/linux/machineid_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Machine id plugin" do let(:plugin) { get_plugin("linux/machineid") } diff --git a/spec/unit/plugins/linux/mdadm_spec.rb b/spec/unit/plugins/linux/mdadm_spec.rb index f2679fdb..a4564077 100644 --- a/spec/unit/plugins/linux/mdadm_spec.rb +++ b/spec/unit/plugins/linux/mdadm_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Linux Mdadm Plugin" do before(:each) do diff --git a/spec/unit/plugins/linux/memory_spec.rb b/spec/unit/plugins/linux/memory_spec.rb index b2bda21f..23c95b9a 100644 --- a/spec/unit/plugins/linux/memory_spec.rb +++ b/spec/unit/plugins/linux/memory_spec.rb @@ -14,7 +14,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Linux memory plugin" do before(:each) do diff --git a/spec/unit/plugins/linux/network_spec.rb b/spec/unit/plugins/linux/network_spec.rb index 1658a6f5..3d0cdec0 100644 --- a/spec/unit/plugins/linux/network_spec.rb +++ b/spec/unit/plugins/linux/network_spec.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" require "ipaddress" describe Ohai::System, "Linux Network Plugin" do diff --git a/spec/unit/plugins/linux/platform_spec.rb b/spec/unit/plugins/linux/platform_spec.rb index bd81344c..0fdc397b 100644 --- a/spec/unit/plugins/linux/platform_spec.rb +++ b/spec/unit/plugins/linux/platform_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Linux plugin platform" do let(:plugin) { get_plugin("linux/platform") } diff --git a/spec/unit/plugins/linux/sessions_spec.rb b/spec/unit/plugins/linux/sessions_spec.rb index 988cbd6f..7b7a613a 100644 --- a/spec/unit/plugins/linux/sessions_spec.rb +++ b/spec/unit/plugins/linux/sessions_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Linux sessions plugin" do let(:plugin) { get_plugin("linux/sessions") } diff --git a/spec/unit/plugins/linux/uptime_spec.rb b/spec/unit/plugins/linux/uptime_spec.rb index 028b7f0c..a70042b3 100644 --- a/spec/unit/plugins/linux/uptime_spec.rb +++ b/spec/unit/plugins/linux/uptime_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Linux plugin uptime" do before(:each) do diff --git a/spec/unit/plugins/linux/virtualization_spec.rb b/spec/unit/plugins/linux/virtualization_spec.rb index 45cddec2..07668d5e 100644 --- a/spec/unit/plugins/linux/virtualization_spec.rb +++ b/spec/unit/plugins/linux/virtualization_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Linux virtualization platform" do let(:plugin) { get_plugin("linux/virtualization") } diff --git a/spec/unit/plugins/lua_spec.rb b/spec/unit/plugins/lua_spec.rb index 58ddeba5..e2726e9c 100644 --- a/spec/unit/plugins/lua_spec.rb +++ b/spec/unit/plugins/lua_spec.rb @@ -18,7 +18,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin lua" do diff --git a/spec/unit/plugins/mono_spec.rb b/spec/unit/plugins/mono_spec.rb index c60f3961..3cccd41d 100644 --- a/spec/unit/plugins/mono_spec.rb +++ b/spec/unit/plugins/mono_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin mono" do let(:plugin) { get_plugin("mono") } diff --git a/spec/unit/plugins/netbsd/hostname_spec.rb b/spec/unit/plugins/netbsd/hostname_spec.rb index d6e94e87..7d71fd35 100644 --- a/spec/unit/plugins/netbsd/hostname_spec.rb +++ b/spec/unit/plugins/netbsd/hostname_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "NetBSD hostname plugin" do before(:each) do diff --git a/spec/unit/plugins/netbsd/kernel_spec.rb b/spec/unit/plugins/netbsd/kernel_spec.rb index 7248a2fa..5e74b68c 100644 --- a/spec/unit/plugins/netbsd/kernel_spec.rb +++ b/spec/unit/plugins/netbsd/kernel_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "NetBSD kernel plugin" do before(:each) do diff --git a/spec/unit/plugins/netbsd/platform_spec.rb b/spec/unit/plugins/netbsd/platform_spec.rb index 48e54af5..b5190a02 100644 --- a/spec/unit/plugins/netbsd/platform_spec.rb +++ b/spec/unit/plugins/netbsd/platform_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "NetBSD plugin platform" do before(:each) do diff --git a/spec/unit/plugins/network_spec.rb b/spec/unit/plugins/network_spec.rb index 45c002d5..864e581e 100644 --- a/spec/unit/plugins/network_spec.rb +++ b/spec/unit/plugins/network_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" def it_doesnt_fail it "doesnt fail" do diff --git a/spec/unit/plugins/nodejs_spec.rb b/spec/unit/plugins/nodejs_spec.rb index cd0d377d..9b365b03 100644 --- a/spec/unit/plugins/nodejs_spec.rb +++ b/spec/unit/plugins/nodejs_spec.rb @@ -18,7 +18,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin nodejs" do diff --git a/spec/unit/plugins/ohai_spec.rb b/spec/unit/plugins/ohai_spec.rb index f7f1f23c..efe41741 100644 --- a/spec/unit/plugins/ohai_spec.rb +++ b/spec/unit/plugins/ohai_spec.rb @@ -18,7 +18,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin ohai" do before(:each) do diff --git a/spec/unit/plugins/ohai_time_spec.rb b/spec/unit/plugins/ohai_time_spec.rb index 7f2c8585..1fea37cd 100644 --- a/spec/unit/plugins/ohai_time_spec.rb +++ b/spec/unit/plugins/ohai_time_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin ohai_time" do before(:each) do diff --git a/spec/unit/plugins/openbsd/hostname_spec.rb b/spec/unit/plugins/openbsd/hostname_spec.rb index cfc33309..b6fbffc2 100644 --- a/spec/unit/plugins/openbsd/hostname_spec.rb +++ b/spec/unit/plugins/openbsd/hostname_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "OpenBSD hostname plugin" do before(:each) do diff --git a/spec/unit/plugins/openbsd/kernel_spec.rb b/spec/unit/plugins/openbsd/kernel_spec.rb index 8d48ac7a..47302c52 100644 --- a/spec/unit/plugins/openbsd/kernel_spec.rb +++ b/spec/unit/plugins/openbsd/kernel_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "OpenBSD kernel plugin" do before(:each) do diff --git a/spec/unit/plugins/openbsd/platform_spec.rb b/spec/unit/plugins/openbsd/platform_spec.rb index 985aaf38..d4f5e0ab 100644 --- a/spec/unit/plugins/openbsd/platform_spec.rb +++ b/spec/unit/plugins/openbsd/platform_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "OpenBSD plugin platform" do before(:each) do diff --git a/spec/unit/plugins/openstack_spec.rb b/spec/unit/plugins/openstack_spec.rb index 7089c7bf..988feb09 100644 --- a/spec/unit/plugins/openstack_spec.rb +++ b/spec/unit/plugins/openstack_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin openstack" do diff --git a/spec/unit/plugins/os_spec.rb b/spec/unit/plugins/os_spec.rb index f054757b..23e4457e 100644 --- a/spec/unit/plugins/os_spec.rb +++ b/spec/unit/plugins/os_spec.rb @@ -19,7 +19,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" ORIGINAL_CONFIG_HOST_OS = ::RbConfig::CONFIG["host_os"] diff --git a/spec/unit/plugins/packages_spec.rb b/spec/unit/plugins/packages_spec.rb index 5e5d922f..a031ef79 100644 --- a/spec/unit/plugins/packages_spec.rb +++ b/spec/unit/plugins/packages_spec.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin packages" do context "on debian" do diff --git a/spec/unit/plugins/passwd_spec.rb b/spec/unit/plugins/passwd_spec.rb index 4d82da52..85932686 100644 --- a/spec/unit/plugins/passwd_spec.rb +++ b/spec/unit/plugins/passwd_spec.rb @@ -14,7 +14,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin etc", :unix_only do before(:each) do diff --git a/spec/unit/plugins/perl_spec.rb b/spec/unit/plugins/perl_spec.rb index b5fd2f42..aecf5b17 100644 --- a/spec/unit/plugins/perl_spec.rb +++ b/spec/unit/plugins/perl_spec.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin perl" do let(:plugin) { get_plugin("perl") } diff --git a/spec/unit/plugins/php_spec.rb b/spec/unit/plugins/php_spec.rb index fcb38bbc..647b608f 100644 --- a/spec/unit/plugins/php_spec.rb +++ b/spec/unit/plugins/php_spec.rb @@ -18,7 +18,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin php" do let(:plugin) { get_plugin("php") } diff --git a/spec/unit/plugins/platform_spec.rb b/spec/unit/plugins/platform_spec.rb index 9cd508f3..6245bd88 100644 --- a/spec/unit/plugins/platform_spec.rb +++ b/spec/unit/plugins/platform_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin platform" do before(:each) do diff --git a/spec/unit/plugins/powershell_spec.rb b/spec/unit/plugins/powershell_spec.rb index 92fe0fb5..754c2745 100644 --- a/spec/unit/plugins/powershell_spec.rb +++ b/spec/unit/plugins/powershell_spec.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin powershell" do let(:plugin) { get_plugin("powershell") } diff --git a/spec/unit/plugins/python_spec.rb b/spec/unit/plugins/python_spec.rb index d92f0f45..353beadc 100644 --- a/spec/unit/plugins/python_spec.rb +++ b/spec/unit/plugins/python_spec.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin python" do let(:stdout) { "2.5.2 (r252:60911, Jan 4 2009, 17:40:26)\n[GCC 4.3.2]\n" } diff --git a/spec/unit/plugins/rackspace_spec.rb b/spec/unit/plugins/rackspace_spec.rb index 99c82621..7343dc54 100644 --- a/spec/unit/plugins/rackspace_spec.rb +++ b/spec/unit/plugins/rackspace_spec.rb @@ -16,7 +16,7 @@ # require "resolv" -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin rackspace" do let(:plugin) { get_plugin("rackspace") } diff --git a/spec/unit/plugins/root_group_spec.rb b/spec/unit/plugins/root_group_spec.rb index 3eca5dd8..77eff706 100644 --- a/spec/unit/plugins/root_group_spec.rb +++ b/spec/unit/plugins/root_group_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "root_group" do before(:each) do diff --git a/spec/unit/plugins/ruby_spec.rb b/spec/unit/plugins/ruby_spec.rb index 91714821..df8c64d9 100644 --- a/spec/unit/plugins/ruby_spec.rb +++ b/spec/unit/plugins/ruby_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" ruby_bin = File.join(::RbConfig::CONFIG["bindir"], ::RbConfig::CONFIG["ruby_install_name"]) diff --git a/spec/unit/plugins/rust_spec.rb b/spec/unit/plugins/rust_spec.rb index 8046d0ee..4a642732 100644 --- a/spec/unit/plugins/rust_spec.rb +++ b/spec/unit/plugins/rust_spec.rb @@ -14,7 +14,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin rust" do let(:stdout) { "rustc 1.0.0-nightly (29bd9a06e 2015-01-20 23:03:09 +0000)" } diff --git a/spec/unit/plugins/scala_spec.rb b/spec/unit/plugins/scala_spec.rb index 76656c98..9c7170bb 100644 --- a/spec/unit/plugins/scala_spec.rb +++ b/spec/unit/plugins/scala_spec.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin scala" do diff --git a/spec/unit/plugins/scsi_spec.rb b/spec/unit/plugins/scsi_spec.rb index e2f2fc34..bc2b3a8c 100644 --- a/spec/unit/plugins/scsi_spec.rb +++ b/spec/unit/plugins/scsi_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "lsscsi plugin" do let(:plugin) { get_plugin("scsi") } diff --git a/spec/unit/plugins/shard_spec.rb b/spec/unit/plugins/shard_spec.rb index 852c82f1..d8d48fa5 100644 --- a/spec/unit/plugins/shard_spec.rb +++ b/spec/unit/plugins/shard_spec.rb @@ -17,7 +17,7 @@ # require "digest/md5" -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "shard plugin" do let(:plugin) { get_plugin("shard") } diff --git a/spec/unit/plugins/shells_spec.rb b/spec/unit/plugins/shells_spec.rb index 13347767..f70218e6 100644 --- a/spec/unit/plugins/shells_spec.rb +++ b/spec/unit/plugins/shells_spec.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin shells" do let(:plugin) { get_plugin("shells") } diff --git a/spec/unit/plugins/softlayer_spec.rb b/spec/unit/plugins/softlayer_spec.rb index 45e63f57..7543eca6 100644 --- a/spec/unit/plugins/softlayer_spec.rb +++ b/spec/unit/plugins/softlayer_spec.rb @@ -17,7 +17,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin softlayer" do let(:plugin) { get_plugin("softlayer") } diff --git a/spec/unit/plugins/solaris2/cpu_spec.rb b/spec/unit/plugins/solaris2/cpu_spec.rb index 83be6589..604cbee5 100644 --- a/spec/unit/plugins/solaris2/cpu_spec.rb +++ b/spec/unit/plugins/solaris2/cpu_spec.rb @@ -14,7 +14,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Solaris2.X cpu plugin" do before(:each) do diff --git a/spec/unit/plugins/solaris2/dmi_spec.rb b/spec/unit/plugins/solaris2/dmi_spec.rb index b4bfdfab..50b45cd8 100644 --- a/spec/unit/plugins/solaris2/dmi_spec.rb +++ b/spec/unit/plugins/solaris2/dmi_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" SOLARIS_DMI_OUT = <<~EOS.freeze ID SIZE TYPE diff --git a/spec/unit/plugins/solaris2/filesystem.rb b/spec/unit/plugins/solaris2/filesystem.rb index a91eb926..d60432eb 100644 --- a/spec/unit/plugins/solaris2/filesystem.rb +++ b/spec/unit/plugins/solaris2/filesystem.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require_relative "../../../spec_helper" +require_relative "spec_helper" describe Ohai::System, "Solaris2.X filesystem plugin" do let(:plugin) { get_plugin("filesystem") } diff --git a/spec/unit/plugins/solaris2/hostname_spec.rb b/spec/unit/plugins/solaris2/hostname_spec.rb index 707ef687..3b3502cd 100644 --- a/spec/unit/plugins/solaris2/hostname_spec.rb +++ b/spec/unit/plugins/solaris2/hostname_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Solaris2.X hostname plugin" do before(:each) do diff --git a/spec/unit/plugins/solaris2/kernel_spec.rb b/spec/unit/plugins/solaris2/kernel_spec.rb index 4f7d0135..633742f6 100644 --- a/spec/unit/plugins/solaris2/kernel_spec.rb +++ b/spec/unit/plugins/solaris2/kernel_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Solaris2.X kernel plugin" do # NOTE: Solaris will report the same module loaded multiple times diff --git a/spec/unit/plugins/solaris2/memory_spec.rb b/spec/unit/plugins/solaris2/memory_spec.rb index c64ae2c4..fe7d2755 100644 --- a/spec/unit/plugins/solaris2/memory_spec.rb +++ b/spec/unit/plugins/solaris2/memory_spec.rb @@ -14,7 +14,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Solaris2.X memory plugin" do before(:each) do diff --git a/spec/unit/plugins/solaris2/network_spec.rb b/spec/unit/plugins/solaris2/network_spec.rb index a14c1a65..3be74827 100644 --- a/spec/unit/plugins/solaris2/network_spec.rb +++ b/spec/unit/plugins/solaris2/network_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Solaris2.X network plugin" do diff --git a/spec/unit/plugins/solaris2/platform_spec.rb b/spec/unit/plugins/solaris2/platform_spec.rb index c819ec9a..249c27d9 100644 --- a/spec/unit/plugins/solaris2/platform_spec.rb +++ b/spec/unit/plugins/solaris2/platform_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Solaris plugin platform" do before(:each) do diff --git a/spec/unit/plugins/solaris2/virtualization_spec.rb b/spec/unit/plugins/solaris2/virtualization_spec.rb index e1df7194..205b053c 100644 --- a/spec/unit/plugins/solaris2/virtualization_spec.rb +++ b/spec/unit/plugins/solaris2/virtualization_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Solaris virtualization platform" do let(:plugin) { get_plugin("solaris2/virtualization") } diff --git a/spec/unit/plugins/ssh_host_keys_spec.rb b/spec/unit/plugins/ssh_host_keys_spec.rb index e3017ee9..b4dfc7e0 100644 --- a/spec/unit/plugins/ssh_host_keys_spec.rb +++ b/spec/unit/plugins/ssh_host_keys_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "ssh_host_key plugin" do diff --git a/spec/unit/plugins/sysconf_spec.rb b/spec/unit/plugins/sysconf_spec.rb index 205be184..8e979110 100644 --- a/spec/unit/plugins/sysconf_spec.rb +++ b/spec/unit/plugins/sysconf_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "sysconf plugin", :unix_only do let(:plugin) { get_plugin("sysconf") } diff --git a/spec/unit/plugins/timezone_spec.rb b/spec/unit/plugins/timezone_spec.rb index 29368a8b..6ced5a25 100644 --- a/spec/unit/plugins/timezone_spec.rb +++ b/spec/unit/plugins/timezone_spec.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "timezone plugin" do before(:each) do diff --git a/spec/unit/plugins/virtualbox_spec.rb b/spec/unit/plugins/virtualbox_spec.rb index dd9819be..a746167e 100644 --- a/spec/unit/plugins/virtualbox_spec.rb +++ b/spec/unit/plugins/virtualbox_spec.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" vbox_output = <<~EOF Oracle VM VirtualBox Guest Additions Command Line Management Interface Version 5.0.2 diff --git a/spec/unit/plugins/vmware_spec.rb b/spec/unit/plugins/vmware_spec.rb index e568fd44..74443312 100644 --- a/spec/unit/plugins/vmware_spec.rb +++ b/spec/unit/plugins/vmware_spec.rb @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "plugin vmware" do let(:plugin) { get_plugin("vmware") } diff --git a/spec/unit/plugins/windows/cpu_spec.rb b/spec/unit/plugins/windows/cpu_spec.rb index c0a17bd7..06665c06 100644 --- a/spec/unit/plugins/windows/cpu_spec.rb +++ b/spec/unit/plugins/windows/cpu_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" shared_examples "a cpu" do |cpu_no| describe "cpu #{cpu_no}" do diff --git a/spec/unit/plugins/windows/filesystem_spec.rb b/spec/unit/plugins/windows/filesystem_spec.rb index 19c95a6c..eb04c513 100644 --- a/spec/unit/plugins/windows/filesystem_spec.rb +++ b/spec/unit/plugins/windows/filesystem_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" require "wmi-lite/wmi" describe Ohai::System, "Windows Filesystem Plugin", :windows_only do diff --git a/spec/unit/plugins/windows/fips_spec.rb b/spec/unit/plugins/windows/fips_spec.rb index 28ef1bce..83876c82 100644 --- a/spec/unit/plugins/windows/fips_spec.rb +++ b/spec/unit/plugins/windows/fips_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" require "openssl" describe Ohai::System, "plugin fips" do diff --git a/spec/unit/plugins/windows/kernel_spec.rb b/spec/unit/plugins/windows/kernel_spec.rb index 0628c7a3..16f5d452 100644 --- a/spec/unit/plugins/windows/kernel_spec.rb +++ b/spec/unit/plugins/windows/kernel_spec.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Windows kernel plugin", :windows_only do let(:plugin) { get_plugin("kernel") } diff --git a/spec/unit/plugins/windows/memory_spec.rb b/spec/unit/plugins/windows/memory_spec.rb index 5e8d97c2..0fad7744 100644 --- a/spec/unit/plugins/windows/memory_spec.rb +++ b/spec/unit/plugins/windows/memory_spec.rb @@ -14,7 +14,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Windows memory plugin", :windows_only do before do diff --git a/spec/unit/plugins/windows/network_spec.rb b/spec/unit/plugins/windows/network_spec.rb index dc474693..84efa447 100644 --- a/spec/unit/plugins/windows/network_spec.rb +++ b/spec/unit/plugins/windows/network_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" require "ipaddress" describe Ohai::System, "Windows Network Plugin" do diff --git a/spec/unit/plugins/windows/system_enclosure_spec.rb b/spec/unit/plugins/windows/system_enclosure_spec.rb index e888538b..5051c8c0 100644 --- a/spec/unit/plugins/windows/system_enclosure_spec.rb +++ b/spec/unit/plugins/windows/system_enclosure_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "System Enclosure", :windows_only do before do diff --git a/spec/unit/plugins/windows/uptime_spec.rb b/spec/unit/plugins/windows/uptime_spec.rb index 91bca8b1..a3fe0138 100644 --- a/spec/unit/plugins/windows/uptime_spec.rb +++ b/spec/unit/plugins/windows/uptime_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Windows plugin uptime" do diff --git a/spec/unit/plugins/windows/virtualization_spec.rb b/spec/unit/plugins/windows/virtualization_spec.rb index 72c09e6b..564ff14c 100644 --- a/spec/unit/plugins/windows/virtualization_spec.rb +++ b/spec/unit/plugins/windows/virtualization_spec.rb @@ -18,7 +18,7 @@ # limitations under the License. # -require_relative "../../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "Windows virtualization platform" do let(:plugin) { get_plugin("windows/virtualization") } diff --git a/spec/unit/plugins/zpools_spec.rb b/spec/unit/plugins/zpools_spec.rb index 3dd53a34..1868da48 100644 --- a/spec/unit/plugins/zpools_spec.rb +++ b/spec/unit/plugins/zpools_spec.rb @@ -13,7 +13,7 @@ # limitations under the License. # -require_relative "../../spec_helper.rb" +require "spec_helper" describe Ohai::System, "zpools plugin" do let(:plugin) { get_plugin("zpools") } diff --git a/spec/unit/provides_map_spec.rb b/spec/unit/provides_map_spec.rb index 67056554..47b1d753 100644 --- a/spec/unit/provides_map_spec.rb +++ b/spec/unit/provides_map_spec.rb @@ -17,7 +17,7 @@ # limitations under the License # -require_relative "../spec_helper.rb" +require "spec_helper" describe Ohai::ProvidesMap do diff --git a/spec/unit/runner_spec.rb b/spec/unit/runner_spec.rb index 19bf8787..a2a948c1 100644 --- a/spec/unit/runner_spec.rb +++ b/spec/unit/runner_spec.rb @@ -17,7 +17,7 @@ # limitations under the License # -require_relative "../spec_helper.rb" +require "spec_helper" describe Ohai::Runner, "run_plugin" do let(:safe_run) { true } diff --git a/spec/unit/system_spec.rb b/spec/unit/system_spec.rb index c74d1f90..f81c67e0 100644 --- a/spec/unit/system_spec.rb +++ b/spec/unit/system_spec.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require_relative "../spec_helper.rb" +require "spec_helper" require "ohai/mixin/os" describe "Ohai::System" do diff --git a/spec/unit/util/file_helper_spec.rb b/spec/unit/util/file_helper_spec.rb index e71e4ca9..88caeb5f 100644 --- a/spec/unit/util/file_helper_spec.rb +++ b/spec/unit/util/file_helper_spec.rb @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require_relative "../../spec_helper.rb" +require "spec_helper" require "ohai/util/file_helper" class FileHelperMock diff --git a/spec/unit/util/ip_helper_spec.rb b/spec/unit/util/ip_helper_spec.rb index bf6a4f22..0532cbc9 100644 --- a/spec/unit/util/ip_helper_spec.rb +++ b/spec/unit/util/ip_helper_spec.rb @@ -15,7 +15,7 @@ # limitations under the License. require "ipaddress" -require_relative "../../spec_helper.rb" +require "spec_helper" require "ohai/util/ip_helper" class IpHelperMock |