Skip to content

Commit

Permalink
Merge pull request #315 from michaelklishin/rabbitmq_3_5_6
Browse files Browse the repository at this point in the history
Provision 3.5.6 by default
  • Loading branch information
JJ Asghar committed Oct 12, 2015
2 parents e6e8744 + 96a5ebf commit 238e9ac
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion attributes/default.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Latest RabbitMQ.com version to install
default['rabbitmq']['version'] = '3.5.5'
default['rabbitmq']['version'] = '3.5.6'
# The distro versions may be more stable and have back-ported patches
default['rabbitmq']['use_distro_version'] = false
# Allow the distro version to be optionally pinned like the rabbitmq.com version
Expand Down
32 changes: 16 additions & 16 deletions spec/default_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
let(:runner) { ChefSpec::ServerRunner.new(UBUNTU_OPTS) }
let(:node) { runner.node }
let(:chef_run) do
node.set['rabbitmq']['version'] = '3.5.5'
node.set['rabbitmq']['version'] = '3.5.6'
runner.converge(described_recipe)
end

Expand All @@ -184,11 +184,11 @@
end

it 'creates a rabbitmq-server deb in the cache path' do
expect(chef_run).to create_remote_file_if_missing('/tmp/rabbitmq-server_3.5.5-1_all.deb')
expect(chef_run).to create_remote_file_if_missing('/tmp/rabbitmq-server_3.5.6-1_all.deb')
end

it 'installs the rabbitmq-server deb_package with the default action' do
expect(chef_run).to install_dpkg_package('/tmp/rabbitmq-server_3.5.5-1_all.deb')
expect(chef_run).to install_dpkg_package('/tmp/rabbitmq-server_3.5.6-1_all.deb')
end

it 'creates a template rabbitmq-server with attributes' do
Expand Down Expand Up @@ -226,13 +226,13 @@
end

it 'creates a rabbitmq-server rpm in the cache path' do
expect(chef_run).to create_remote_file_if_missing('/tmp/rabbitmq-server-3.5.5-1.noarch.rpm')
expect(chef_run).to_not create_remote_file_if_missing('/tmp/not-rabbitmq-server-3.5.5-1.noarch.rpm')
expect(chef_run).to create_remote_file_if_missing('/tmp/rabbitmq-server-3.5.6-1.noarch.rpm')
expect(chef_run).to_not create_remote_file_if_missing('/tmp/not-rabbitmq-server-3.5.6-1.noarch.rpm')
end

it 'installs the rabbitmq-server rpm_package with the default action' do
expect(chef_run).to install_rpm_package('/tmp/rabbitmq-server-3.5.5-1.noarch.rpm')
expect(chef_run).to_not install_rpm_package('/tmp/not-rabbitmq-server-3.5.5-1.noarch.rpm')
expect(chef_run).to install_rpm_package('/tmp/rabbitmq-server-3.5.6-1.noarch.rpm')
expect(chef_run).to_not install_rpm_package('/tmp/not-rabbitmq-server-3.5.6-1.noarch.rpm')
end

describe 'uses distro version' do
Expand Down Expand Up @@ -273,13 +273,13 @@
end

it 'creates a rabbitmq-server rpm in the cache path' do
expect(chef_run).to create_remote_file_if_missing('/tmp/rabbitmq-server-3.5.5-1.noarch.rpm')
expect(chef_run).to_not create_remote_file_if_missing('/tmp/not-rabbitmq-server-3.5.5-1.noarch.rpm')
expect(chef_run).to create_remote_file_if_missing('/tmp/rabbitmq-server-3.5.6-1.noarch.rpm')
expect(chef_run).to_not create_remote_file_if_missing('/tmp/not-rabbitmq-server-3.5.6-1.noarch.rpm')
end

it 'installs the rabbitmq-server rpm_package with the default action' do
expect(chef_run).to install_rpm_package('/tmp/rabbitmq-server-3.5.5-1.noarch.rpm')
expect(chef_run).to_not install_rpm_package('/tmp/not-rabbitmq-server-3.5.5-1.noarch.rpm')
expect(chef_run).to install_rpm_package('/tmp/rabbitmq-server-3.5.6-1.noarch.rpm')
expect(chef_run).to_not install_rpm_package('/tmp/not-rabbitmq-server-3.5.6-1.noarch.rpm')
end

it 'includes the `yum-epel` recipe' do
Expand All @@ -301,18 +301,18 @@
let(:runner) { ChefSpec::ServerRunner.new(FEDORA_OPTS) }
let(:node) { runner.node }
let(:chef_run) do
node.set['rabbitmq']['version'] = '3.5.5'
node.set['rabbitmq']['version'] = '3.5.6'
runner.converge(described_recipe)
end

it 'creates a rabbitmq-server rpm in the cache path' do
expect(chef_run).to create_remote_file_if_missing('/tmp/rabbitmq-server-3.5.5-1.noarch.rpm')
expect(chef_run).to_not create_remote_file_if_missing('/tmp/not-rabbitmq-server-3.5.5-1.noarch.rpm')
expect(chef_run).to create_remote_file_if_missing('/tmp/rabbitmq-server-3.5.6-1.noarch.rpm')
expect(chef_run).to_not create_remote_file_if_missing('/tmp/not-rabbitmq-server-3.5.6-1.noarch.rpm')
end

it 'installs the rabbitmq-server rpm_package with the default action' do
expect(chef_run).to install_rpm_package('/tmp/rabbitmq-server-3.5.5-1.noarch.rpm')
expect(chef_run).to_not install_rpm_package('/tmp/not-rabbitmq-server-3.5.5-1.noarch.rpm')
expect(chef_run).to install_rpm_package('/tmp/rabbitmq-server-3.5.6-1.noarch.rpm')
expect(chef_run).to_not install_rpm_package('/tmp/not-rabbitmq-server-3.5.6-1.noarch.rpm')
end

describe 'uses distro version' do
Expand Down

0 comments on commit 238e9ac

Please sign in to comment.