summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobb Kidd <robb@thekidds.org>2019-10-18 17:30:58 -0400
committerRobb Kidd <robb@thekidds.org>2019-11-01 14:22:33 -0400
commit894bc3ec198fa06f4aefa2149dae51c4cd9684f7 (patch)
tree9e0d574c1772db5447dcc3f0e0597324818f6368
parent6dad9e3243cc8fffba58476040c1534e72d90345 (diff)
downloadchef-894bc3ec198fa06f4aefa2149dae51c4cd9684f7.tar.gz
disable choco specs directly
We can disable the :choco_installed specs directly in the execution of RSpec instead of deleting the choco.exe binary from the test system to fool the "filter_run_excluding choco_installed" config in spec_helper. Signed-off-by: Robb Kidd <robb@thekidds.org>
-rw-r--r--omnibus/omnibus-test.ps16
1 files changed, 2 insertions, 4 deletions
diff --git a/omnibus/omnibus-test.ps1 b/omnibus/omnibus-test.ps1
index b6f054370c..4871ff0ec7 100644
--- a/omnibus/omnibus-test.ps1
+++ b/omnibus/omnibus-test.ps1
@@ -82,14 +82,12 @@ Get-Location
# ffi-yajl must run in c-extension mode for perf, so force it so we don't accidentally fall back to ffi
$Env:FORCE_FFI_YAJL = "ext"
-# chocolatey functional tests fail so delete the chocolatey binary to avoid triggering them
-Remove-Item -Path C:\ProgramData\chocolatey\bin\choco.exe -ErrorAction SilentlyContinue
-
# some tests need winrm configured
winrm quickconfig -quiet
bundle
If ($lastexitcode -ne 0) { Exit $lastexitcode }
-bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation spec/functional
+# chocolatey functional tests fail so disable that tag directly
+bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation --tag ~choco_installed spec/functional
If ($lastexitcode -ne 0) { Exit $lastexitcode }