summaryrefslogtreecommitdiff
path: root/platform_simulation_specs
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-02-18 09:08:50 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2016-02-18 09:08:50 -0800
commit0777d83eda29121c5ecf7b0b7f2049cb41c7b1e3 (patch)
treea60ff4fbf3023690e8f34b282609bf8d888652ad /platform_simulation_specs
parentf8213f988929e300db3a3bf52e4c49cecac8ad2e (diff)
downloadohai-0777d83eda29121c5ecf7b0b7f2049cb41c7b1e3.tar.gz
reverting errant pushes to master without PR
Diffstat (limited to 'platform_simulation_specs')
-rw-r--r--platform_simulation_specs/common/ohai_plugin_common.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/platform_simulation_specs/common/ohai_plugin_common.rb b/platform_simulation_specs/common/ohai_plugin_common.rb
index 229272c7..78dbc90f 100644
--- a/platform_simulation_specs/common/ohai_plugin_common.rb
+++ b/platform_simulation_specs/common/ohai_plugin_common.rb
@@ -32,7 +32,7 @@ module OhaiPluginCommon
# env = JSON.load(env)
- argv = ARGV.map { |arg| ( /\ / =~ arg ) ? "\"" + arg + "\"" : arg }.join " "
+ argv = ARGV.map { |arg| if /\ / =~ arg then "\"" + arg + "\"" else arg end }.join " "
match = data[platform][arch].select { |v| v[:params] == argv && v[:env] == env }
raise "No canned output for these settings." if match.empty?
@@ -199,7 +199,7 @@ def test_plugin(plugin_names, cmd_list)
return
# clean the path directory, in case a previous test was interrupted
- OhaiPluginCommon.clean_path OhaiPluginCommon.get_path, /^.*\.rb$/ # rubocop:disable Lint/UnreachableCode
+ OhaiPluginCommon.clean_path OhaiPluginCommon.get_path, /^.*\.rb$/
l = lambda do |*args|
platforms = args[0]