Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated the error message and start message branding #17

Merged
merged 2 commits into from
Nov 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions features/kitchen_test_command.feature
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ Feature: Running a full test instance test
@spawn
Scenario: Running a single instance
When I run `kitchen test client-beans`
Then the output should contain "Starting Test Kitchen"
Then the output should contain "Starting Chef Test Kitchen Enterprise"
Then the output should contain "Cleaning up any prior instances of <client-beans>"
Then the output should contain "Testing <client-beans>"
Then the output should contain "Finished testing <client-beans>"
Then the output should contain "Test Kitchen is finished."
Then the output should contain "Chef Test Kitchen Enterprise is finished."
And the exit status should be 0

@spawn
Expand Down Expand Up @@ -74,12 +74,12 @@ Feature: Running a full test instance test
@spawn
Scenario: Running all instances
When I run `kitchen test`
Then the output should contain "Starting Test Kitchen"
Then the output should contain "Starting Chef Test Kitchen Enterprise"
Then the output should contain "Finished testing <client-cool>"
Then the output should contain "Finished testing <client-beans>"
Then the output should contain "Finished testing <server-cool>"
Then the output should contain "Finished testing <server-beans>"
Then the output should contain "Test Kitchen is finished."
Then the output should contain "Chef Test Kitchen Enterprise is finished."
And the exit status should be 0
When I successfully run `kitchen list`
Then the output should match /^client-cool\s+.+\s+\<Not Created\>\s+\<None\>$/
Expand Down
4 changes: 2 additions & 2 deletions lib/kitchen/command/action.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ class Action < Kitchen::Command::Base

# Invoke the command.
def call
banner "Starting Test Kitchen (v#{Kitchen::VERSION})"
banner "Starting Chef Test Kitchen Enterprise (v#{Kitchen::VERSION})"
elapsed = Benchmark.measure do
results = parse_subcommand(args.first)
run_action(action, results)
end
banner "Test Kitchen is finished. #{Util.duration(elapsed.real)}"
banner "Chef Test Kitchen Enterprise is finished. #{Util.duration(elapsed.real)}"
end
end
end
Expand Down
4 changes: 2 additions & 2 deletions lib/kitchen/command/test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ def call
raise ArgumentError, "Destroy mode must be passing, always, or never."
end

banner "Starting Test Kitchen (v#{Kitchen::VERSION})"
banner "Starting Chef Test Kitchen Enterprise (v#{Kitchen::VERSION})"
elapsed = Benchmark.measure do
destroy_mode = options[:destroy].to_sym
results = parse_subcommand(args.join("|"))

run_action(:test, results, destroy_mode)
end
banner "Test Kitchen is finished. #{Util.duration(elapsed.real)}"
banner "Chef Test Kitchen Enterprise is finished. #{Util.duration(elapsed.real)}"
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/kitchen/licensing/base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class Base
class << self
def get_license_keys
keys = ChefLicensing.license_keys
raise ChefLicensing::InvalidLicense, "A valid license is required to perform this action." if keys.blank?
raise ChefLicensing::InvalidLicense, "A valid license is required to perform this action. Run <kitchen license> command to generate/activate the license." if keys.blank?

client = get_license_client(keys)

Expand Down
Loading