Created
September 13, 2019 16:32
-
-
Save marcparadise/3c7470aee219a0c9ae847ac98928e223 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18,19c18,19 | |
< require_relative "exceptions" | |
< require_relative "helpers" | |
--- | |
> require "chef-cli/exceptions" | |
> require "chef-cli/helpers" | |
42,43c42,47 | |
< module ChefCLI | |
< class ComponentTest | |
--- | |
> module ChefWorkstation | |
> class MissingComponentError < RuntimeError | |
> def initialize(component_name, reason) | |
> super("Component #{component_name} is missing.\nReason: #{reason}") | |
> end | |
> end | |
44a49 | |
> class ComponentTest | |
61c66 | |
< include Helpers | |
--- | |
> include ChefCLI::Helpers |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18,21c18 | |
< require_relative "base" | |
< require_relative "../exceptions" | |
< require_relative "../component_test" | |
< require_relative "../dist" | |
--- | |
> # NOTE: Verify.run is invoked from omnibus-test.ps1 and omnibus-test.sh | |
23c20,29 | |
< module ChefCLI | |
--- | |
> require "chef" | |
> require "chef-cli" | |
> require "chef-cli/dist" | |
> require "chef-cli/command/base" | |
> require "chef-cli/exceptions" | |
> require "chef-cli/helpers" | |
> | |
> require_relative "component_test" | |
> | |
> module ChefWorkstation | |
26,32d31 | |
< # TODO 2019-07-05 mp - this gets a little odd, because | |
< # this the commands that we verify here do not ship with | |
< # the chef-cli component - they're only in Workstation and DK. | |
< # This should continue to work in an installed Workstation package, | |
< # but we will probably want to find some way of letting clients (Workstation) | |
< # override this command so that it can report on all | |
< # of the components it installs. | |
96,102c95,98 | |
< # See older versions of this file in git to retrieve | |
< # our cucumber test command for berkshelf. | |
< # We had to remove them because we no longer bundle These tests cannot be run unless we bundle cucumber | |
< # c.integration_test do | |
< # bundle_install_mutex.synchronize { sh("#{embedded_bin("bundle")} install") } | |
< # sh("#{embedded_bin("bundle")} exec #{embedded_bin("cucumber")} --color --format progress --tags ~@no_run --tags ~@spawn --tags ~@graphviz --strict") | |
< # end | |
--- | |
> c.integration_test do | |
> bundle_install_mutex.synchronize { sh("#{embedded_bin("bundle")} install") } | |
> sh("#{embedded_bin("bundle")} exec #{embedded_bin("cucumber")} --color --format progress --tags ~@no_run --tags ~@spawn --tags ~@graphviz --strict") | |
> end | |
117a114 | |
> | |
461c458 | |
< config[:omnibus_dir] || super | |
--- | |
> config[:omnibus_dir] || super |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment