Skip to content

Commit 277e3e8

Browse files
authored
Merge pull request voxpupuli#911 from wyardley/wyardley/test_version_regex
Update tests for rabbitmqctl version parsing
2 parents 1e8c72e + d8e1013 commit 277e3e8

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

spec/unit/puppet/provider/rabbitmq_cli_spec.rb

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,23 @@
1313
end
1414

1515
it 'gets the RabbitMQ version' do
16-
provider_class.expects(:rabbitmqctl).with('-q', 'status').returns '{rabbit,"RabbitMQ","3.1.5"}'
17-
expect(provider_class.rabbitmq_version).to eq('3.1.5')
16+
provider_class.expects(:rabbitmqctl).with('-q', 'status').returns ' [{rabbit,"RabbitMQ","3.7.28"},'
17+
expect(provider_class.rabbitmq_version).to eq('3.7.28')
1818
end
1919

2020
it 'caches the RabbitMQ version' do
21-
provider_class.expects(:rabbitmqctl).with('-q', 'status').returns '{rabbit,"RabbitMQ","3.7.10"}'
21+
provider_class.expects(:rabbitmqctl).with('-q', 'status').returns ' [{rabbit,"RabbitMQ","3.7.28"},'
2222
v1 = provider_class.rabbitmq_version
2323

2424
# No second expects for rabbitmqctl as it shouldn't be called again
2525
expect(provider_class.rabbitmq_version).to eq(v1)
2626
end
2727

28+
it 'gets the RabbitMQ version with version >= 3.8' do
29+
provider_class.expects(:rabbitmqctl).with('-q', 'status').returns 'RabbitMQ version: 3.10.6'
30+
expect(provider_class.rabbitmq_version).to eq('3.10.6')
31+
end
32+
2833
it 'uses correct list options with RabbitMQ < 3.7.9' do
2934
provider_class.expects(:rabbitmq_version).returns '3.7.8'
3035
provider_class.expects(:rabbitmqctl).with('list_vhost', '-q').returns ''

0 commit comments

Comments
 (0)