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.

Sign up for GitHub

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

Jump to bottom

Fit kitchen test failures #385

Merged
merged 2 commits into from
Dec 16, 2016
Merged

Fit kitchen test failures #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd90bcd
Centralized consul version in tests
Dec 14, 2016
56f578f
Removed zip installation test
Dec 14, 2016
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
2 changes: 0 additions & 2 deletions test/integration/client/serverspec/default_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
require 'spec_helper'
require 'json'

consul_version = '0.7.0'

if windows?
consul_executable = "C:\\Program Files\\consul\\#{consul_version}\\consul.exe"
consul_command = "& '#{consul_executable}'"
Expand Down
2 changes: 0 additions & 2 deletions test/integration/default/serverspec/default_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
require 'spec_helper'

consul_version = '0.7.1'

if windows?
consul_executable = "C:\\Program Files\\consul\\#{consul_version}\\consul.exe"
consul_command = "& '#{consul_executable}'"
Expand Down
4 changes: 4 additions & 0 deletions test/integration/helpers/serverspec/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ def windows?
(/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
end

def consul_version
'0.7.1'
end

if !windows?
set :backend, :exec
else
Expand Down
48 changes: 0 additions & 48 deletions test/integration/zip/serverspec/default_spec.rb
View file
Open in desktop

This file was deleted.