Skip to content

Commit

Permalink
use one tag so tests dont repeat
Browse files Browse the repository at this point in the history
  • Loading branch information
williscool committed Jul 26, 2023
1 parent 1959e26 commit 1c3adc1
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions spec/workload/operator_spec.cr
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ require "file_utils"
require "sam"
require "json"

OPERATOR_JSON_FILE = "operator.json"
MANAGER_JSON_FILE = "manager.json"

describe "Operator" do

describe "pre OLM install" do
Expand Down Expand Up @@ -42,9 +45,6 @@ describe "Operator" do

after_all do
# uninstall OLM
OPERATOR_JSON_FILE = "operator.json"
MANAGER_JSON_FILE = "manager.json"

pods = KubectlClient::Get.pods_by_resource(KubectlClient::Get.deployment("catalog-operator", "operator-lifecycle-manager"), "operator-lifecycle-manager") + KubectlClient::Get.pods_by_resource(KubectlClient::Get.deployment("olm-operator", "operator-lifecycle-manager"), "operator-lifecycle-manager") + KubectlClient::Get.pods_by_resource(KubectlClient::Get.deployment("packageserver", "operator-lifecycle-manager"), "operator-lifecycle-manager")

Helm.uninstall("operator")
Expand Down Expand Up @@ -110,7 +110,7 @@ describe "Operator" do
end
end

it "'operator_privileged' test privileged operator NOT being used", tags: ["operator_test","operator_privileged"] do
it "'operator_privileged' test privileged operator NOT being used", tags: ["operator_privileged"] do
begin
LOGGING.info `./cnf-testsuite -l info cnf_setup cnf-path=./sample-cnfs/sample_operator`
$?.success?.should be_true
Expand All @@ -123,7 +123,7 @@ describe "Operator" do
end
end

it "'operator_privileged' test if a privileged operator is being used", tags: ["operator_test", "operator_privileged"] do
it "'operator_privileged' test if a privileged operator is being used", tags: ["operator_privileged"] do
begin
LOGGING.info `./cnf-testsuite -l info cnf_setup cnf-path=./sample-cnfs/sample_privileged_operator`
$?.success?.should be_true
Expand Down

0 comments on commit 1c3adc1

Please sign in to comment.