Skip to content

Commit 2174f35

Browse files
authored
Change: Cluster setup exception message shortened (#2055)
* Change: Cluster setup exception message shortened Refs: #1926 - The unnecessary stack trace was not printed through e.message as I suspected but due to raise itself. That is why I instead used puts to print out the informative message and the e.message remained in the form of an info log. - I also made the informative message more explicit as someone not used to the testsuite might not have understood it. Signed-off-by: svteb <[email protected]> * fix: Remediation message made less explicit Refs: #1926 Signed-off-by: svteb <[email protected]> * Fix: Task fails with proper exit code and the spec tests are adjusted for new output Refs: #1926 Signed-off-by: svteb <[email protected]> * Style: Shortened spec test result checking and updated log message to Log.error Refs: #1926 Signed-off-by: svteb <[email protected]> --------- Signed-off-by: svteb <[email protected]>
1 parent 9497fd6 commit 2174f35

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

spec/cluster_setup_spec.cr

+3-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ require "kubectl_client"
55
require "cluster_tools"
66

77
describe "Cluster Setup" do
8-
98
before_each do
109
result = ShellCmd.run_testsuite("cleanup")
1110
result[:status].success?.should be_true
@@ -15,7 +14,7 @@ describe "Cluster Setup" do
1514
KubectlClient::Delete.command("namespace #{ClusterTools.namespace}")
1615
result = ShellCmd.run_testsuite("install_cluster_tools")
1716
result[:status].success?.should be_false
18-
(/please run cnf-testsuite setup/ =~ result[:output]).should_not be_nil
17+
(/Error: Namespace cnf-testsuite does not exist./ =~ result[:output]).should_not be_nil
1918
end
2019

2120
it "'install_cluster_tools' should give a message if namespace does not exist even after setup", tags: ["cluster_setup"] do
@@ -25,13 +24,12 @@ describe "Cluster Setup" do
2524

2625
result = ShellCmd.run_testsuite("install_cluster_tools")
2726
result[:status].success?.should be_false
28-
(/please run cnf-testsuite setup/ =~ result[:output]).should_not be_nil
27+
(/Error: Namespace cnf-testsuite does not exist./ =~ result[:output]).should_not be_nil
2928
end
3029

3130
it "'uninstall_cluster_tools' should give a message if namespace does not exist", tags: ["cluster_setup"] do
3231
result = ShellCmd.run_testsuite("uninstall_cluster_tools")
3332
result[:status].success?.should be_false
34-
(/please run cnf-testsuite setup/ =~ result[:output]).should_not be_nil
33+
(/Error: Namespace cnf-testsuite does not exist./ =~ result[:output]).should_not be_nil
3534
end
36-
3735
end

src/tasks/cluster_setup.cr

+7-5
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,22 @@ require "./utils/utils.cr"
1010

1111
desc "Install CNF Test Suite Cluster Tools"
1212
task "install_cluster_tools" do |_, args|
13-
Log.info { "install_cluster_tools" }
14-
1513
begin
1614
ClusterTools.install
1715
rescue e : ClusterTools::NamespaceDoesNotExistException
18-
raise "#{e.message}. please run cnf-testsuite setup!"
16+
Log.error { "#{e.message}" }
17+
stdout_failure "Error: Namespace cnf-testsuite does not exist.\nPlease run 'cnf-testsuite setup' to create the necessary namespace."
18+
exit(1)
1919
end
2020
end
2121

2222
desc "Uninstall CNF Test Suite Cluster Tools"
2323
task "uninstall_cluster_tools" do |_, args|
2424
begin
2525
ClusterTools.uninstall
26-
rescue e : ClusterTools::NamespaceDoesNotExistException
27-
raise "#{e.message}. please run cnf-testsuite setup!"
26+
rescue e : ClusterTools::NamespaceDoesNotExistException
27+
Log.error { "#{e.message}" }
28+
stdout_failure "Error: Namespace cnf-testsuite does not exist.\nPlease run 'cnf-testsuite setup' to create the necessary namespace."
29+
exit(1)
2830
end
2931
end

0 commit comments

Comments
 (0)