summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@chef.io>2019-12-13 12:34:49 -0800
committerGitHub <noreply@github.com>2019-12-13 12:34:49 -0800
commit03fa4520d98db7153fa07ce417ee75e166edc68c (patch)
tree11a6a020c7efc0d32ffc1d5cac60f9c844ee8f34
parent75f093120e05c368ad2c807c0e3ae9118728d8ef (diff)
parente150b261d30bf41d8444cd13b22d1f924bc9fd76 (diff)
downloadchef-03fa4520d98db7153fa07ce417ee75e166edc68c.tar.gz
try unit + functional tests (#9163)
try unit + functional tests
-rw-r--r--omnibus/omnibus-test.ps18
-rw-r--r--omnibus/omnibus-test.sh4
2 files changed, 8 insertions, 4 deletions
diff --git a/omnibus/omnibus-test.ps1 b/omnibus/omnibus-test.ps1
index dfa69d74b1..875813e56b 100644
--- a/omnibus/omnibus-test.ps1
+++ b/omnibus/omnibus-test.ps1
@@ -91,6 +91,10 @@ winrm quickconfig -quiet
bundle
If ($lastexitcode -ne 0) { Exit $lastexitcode }
-# 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
+# NOTE: we have unit tests in chef/chef which ARE NOT unit tests. We need to run them on the actual shipping production artifact on the
+# actual distro that they're expected to run on, or we lose test coverage, which leads to shipping regressions. We need to run all the
+# tests here before shipping. The integration specs have been removed due to bugginess with license acceptance, but that should be fixed.
+#
+# chocolatey functional tests fail so disable that tag directly <-- and this is a bug that needs fixing.
+bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation --tag ~choco_installed spec/functional spec/unit
If ($lastexitcode -ne 0) { Exit $lastexitcode }
diff --git a/omnibus/omnibus-test.sh b/omnibus/omnibus-test.sh
index d5d5959e12..93197800e5 100644
--- a/omnibus/omnibus-test.sh
+++ b/omnibus/omnibus-test.sh
@@ -159,5 +159,5 @@ cd "$chef_gem"
sudo -E bundle install
# NOTE: we have unit tests in chef/chef which ARE NOT unit tests. We need to run them on the actual shipping production artifact on the
# actual distro that they're expected to run on, or we lose test coverage, which leads to shipping regressions. We need to run all the
-# tests here before shipping.
-sudo -E bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation
+# tests here before shipping. The integration specs have been removed due to bugginess with license acceptance, but that should be fixed.
+sudo -E bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation spec/unit spec/functional