From 75f093120e05c368ad2c807c0e3ae9118728d8ef Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Fri, 13 Dec 2019 12:33:46 -0800 Subject: Revert "try unit + functional tests" This reverts commit d75137590c6a1e138c02f5a42f8c9e12732c94c7. --- omnibus/omnibus-test.ps1 | 8 ++------ omnibus/omnibus-test.sh | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'omnibus') diff --git a/omnibus/omnibus-test.ps1 b/omnibus/omnibus-test.ps1 index 875813e56b..dfa69d74b1 100644 --- a/omnibus/omnibus-test.ps1 +++ b/omnibus/omnibus-test.ps1 @@ -91,10 +91,6 @@ winrm quickconfig -quiet bundle If ($lastexitcode -ne 0) { Exit $lastexitcode } -# 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 +# 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 } diff --git a/omnibus/omnibus-test.sh b/omnibus/omnibus-test.sh index 93197800e5..d5d5959e12 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. 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 +# tests here before shipping. +sudo -E bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation -- cgit v1.2.1