summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-02-19 17:13:20 -0800
committerGitHub <noreply@github.com>2020-02-19 17:13:20 -0800
commit035befeb47255eb3401c8450930247d624b0effd (patch)
treeda3b84be755d0b6412e855b11ef9872bd7ef2709
parent582a682e1c711709b282c20d3b1bfa03d1a39039 (diff)
parent6a27c0e313343fe7aa3accf768f8d2805f433c7d (diff)
downloadohai-035befeb47255eb3401c8450930247d624b0effd.tar.gz
Merge pull request #1432 from chef/testing
Minor testing updates
-rwxr-xr-x.expeditor/run_linux_tests.sh2
-rw-r--r--.rubocop.yml6
-rw-r--r--Gemfile4
3 files changed, 2 insertions, 10 deletions
diff --git a/.expeditor/run_linux_tests.sh b/.expeditor/run_linux_tests.sh
index 4c14c804..2e6c34c0 100755
--- a/.expeditor/run_linux_tests.sh
+++ b/.expeditor/run_linux_tests.sh
@@ -50,4 +50,4 @@ else
fi
echo "+++ bundle exec task"
-bundle exec $1
+bundle exec $@
diff --git a/.rubocop.yml b/.rubocop.yml
index 059ac238..cc7160b9 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -9,8 +9,4 @@ AllCops:
Layout/Tab:
Exclude:
- "lib/ohai/plugins/mono.rb"
- - "lib/ohai/plugins/darwin/hardware.rb"
-
-# this can cause failures that we need to look at one by one
-Performance/RegexpMatch:
- Enabled: false
+ - "lib/ohai/plugins/darwin/hardware.rb" \ No newline at end of file
diff --git a/Gemfile b/Gemfile
index 66ed54c7..2eceb4d4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,10 +13,6 @@ group :development do
gem "ipaddr_extensions"
end
-group :ci do
- gem "rspec_junit_formatter"
-end
-
group :docs do
gem "yard"
gem "redcarpet"