(rubocop) Fix Style/StringLiterals

This commit is contained in:
Tim Sharpe 2019-02-03 10:42:28 +11:00
parent cf2295ccfd
commit 1272343cdd
12 changed files with 181 additions and 181 deletions

View file

@ -5,7 +5,7 @@ require_relative '../../lib/vmfloaty/utils'
describe Utils do
describe "#standardize_hostnames" do
describe '#standardize_hostnames' do
before :each do
@vmpooler_response_body ='{
"ok": true,
@ -28,24 +28,24 @@ describe Utils do
}'
end
it "formats a result from vmpooler into a hash of os to hostnames" do
it 'formats a result from vmpooler into a hash of os to hostnames' do
result = Utils.standardize_hostnames(JSON.parse(@vmpooler_response_body))
expect(result).to eq('centos-7-x86_64' => ["dlgietfmgeegry2.delivery.mycompany.net"],
'ubuntu-1610-x86_64' => ["gdoy8q3nckuob0i.delivery.mycompany.net", "ctnktsd0u11p9tm.delivery.mycompany.net"])
expect(result).to eq('centos-7-x86_64' => ['dlgietfmgeegry2.delivery.mycompany.net'],
'ubuntu-1610-x86_64' => ['gdoy8q3nckuob0i.delivery.mycompany.net', 'ctnktsd0u11p9tm.delivery.mycompany.net'])
end
it "formats a result from the nonstandard pooler into a hash of os to hostnames" do
it 'formats a result from the nonstandard pooler into a hash of os to hostnames' do
result = Utils.standardize_hostnames(JSON.parse(@nonstandard_response_body))
expect(result).to eq('solaris-10-sparc' => ['sol10-10.delivery.mycompany.net', 'sol10-11.delivery.mycompany.net'],
'ubuntu-16.04-power8' => ['power8-ubuntu16.04-6.delivery.mycompany.net'])
end
end
describe "#format_host_output" do
describe '#format_host_output' do
before :each do
@vmpooler_results = {
'centos-7-x86_64' => ["dlgietfmgeegry2.delivery.mycompany.net"],
'ubuntu-1610-x86_64' => ["gdoy8q3nckuob0i.delivery.mycompany.net", "ctnktsd0u11p9tm.delivery.mycompany.net"]
'centos-7-x86_64' => ['dlgietfmgeegry2.delivery.mycompany.net'],
'ubuntu-1610-x86_64' => ['gdoy8q3nckuob0i.delivery.mycompany.net', 'ctnktsd0u11p9tm.delivery.mycompany.net']
}
@nonstandard_results = {
'solaris-10-sparc' => ['sol10-10.delivery.mycompany.net', 'sol10-11.delivery.mycompany.net'],
@ -62,43 +62,43 @@ describe Utils do
- power8-ubuntu16.04-6.delivery.mycompany.net (ubuntu-16.04-power8)
OUT
end
it "formats a hostname hash from vmpooler into a list that includes the os" do
it 'formats a hostname hash from vmpooler into a list that includes the os' do
expect(Utils.format_host_output(@vmpooler_results)).to eq(@vmpooler_output)
end
it "formats a hostname hash from the nonstandard pooler into a list that includes the os" do
it 'formats a hostname hash from the nonstandard pooler into a list that includes the os' do
expect(Utils.format_host_output(@nonstandard_results)).to eq(@nonstandard_output)
end
end
describe "#get_service_object" do
it "assumes vmpooler by default" do
describe '#get_service_object' do
it 'assumes vmpooler by default' do
expect(Utils.get_service_object).to be Pooler
end
it "uses nspooler when told explicitly" do
expect(Utils.get_service_object "nspooler").to be NonstandardPooler
it 'uses nspooler when told explicitly' do
expect(Utils.get_service_object 'nspooler').to be NonstandardPooler
end
end
describe "#get_service_config" do
describe '#get_service_config' do
before :each do
@default_config = {
"url" => "http://default.url",
"user" => "first.last.default",
"token" => "default-token",
'url' => 'http://default.url',
'user' => 'first.last.default',
'token' => 'default-token',
}
@services_config = {
"services" => {
"vm" => {
"url" => "http://vmpooler.url",
"user" => "first.last.vmpooler",
"token" => "vmpooler-token"
'services' => {
'vm' => {
'url' => 'http://vmpooler.url',
'user' => 'first.last.vmpooler',
'token' => 'vmpooler-token'
},
"ns" => {
"url" => "http://nspooler.url",
"user" => "first.last.nspooler",
"token" => "nspooler-token"
'ns' => {
'url' => 'http://nspooler.url',
'user' => 'first.last.nspooler',
'token' => 'nspooler-token'
}
}
}
@ -110,44 +110,44 @@ describe Utils do
expect(Utils.get_service_config(config, options)).to include @services_config['services']['vm']
end
it "allows selection by configured service key" do
it 'allows selection by configured service key' do
config = @default_config.merge @services_config
options = MockOptions.new({:service => "ns"})
options = MockOptions.new({:service => 'ns'})
expect(Utils.get_service_config(config, options)).to include @services_config['services']['ns']
end
it "uses top-level service config values as defaults when configured service values are missing" do
it 'uses top-level service config values as defaults when configured service values are missing' do
config = @default_config.merge @services_config
config["services"]['vm'].delete 'url'
options = MockOptions.new({:service => "vm"})
config['services']['vm'].delete 'url'
options = MockOptions.new({:service => 'vm'})
expect(Utils.get_service_config(config, options)['url']).to eq 'http://default.url'
end
it "raises an error if passed a service name that hasn't been configured" do
config = @default_config.merge @services_config
options = MockOptions.new({:service => "none"})
options = MockOptions.new({:service => 'none'})
expect { Utils.get_service_config(config, options) }.to raise_error ArgumentError
end
it "prioritizes values passed as command line options over configuration options" do
it 'prioritizes values passed as command line options over configuration options' do
config = @default_config
options = MockOptions.new({:url => "http://alternate.url", :token => "alternate-token"})
expected = config.merge({"url" => "http://alternate.url", "token" => "alternate-token"})
options = MockOptions.new({:url => 'http://alternate.url', :token => 'alternate-token'})
expected = config.merge({'url' => 'http://alternate.url', 'token' => 'alternate-token'})
expect(Utils.get_service_config(config, options)).to include expected
end
end
describe "#generate_os_hash" do
describe '#generate_os_hash' do
before :each do
@host_hash = {"centos"=>1, "debian"=>5, "windows"=>1}
@host_hash = {'centos'=>1, 'debian'=>5, 'windows'=>1}
end
it "takes an array of os arguments and returns a formatted hash" do
host_arg = ["centos", "debian=5", "windows=1"]
it 'takes an array of os arguments and returns a formatted hash' do
host_arg = ['centos', 'debian=5', 'windows=1']
expect(Utils.generate_os_hash(host_arg)).to eq @host_hash
end
it "returns an empty hash if there are no arguments provided" do
it 'returns an empty hash if there are no arguments provided' do
host_arg = []
expect(Utils.generate_os_hash(host_arg)).to be_empty
end
@ -166,7 +166,7 @@ describe Utils do
'ip' => '127.0.0.1',
'domain' => 'delivery.mycompany.net'
}}
output = "- mcpy42eqjxli9g2.delivery.mycompany.net (ubuntu-1604-x86_64, 9.66/12 hours)"
output = '- mcpy42eqjxli9g2.delivery.mycompany.net (ubuntu-1604-x86_64, 9.66/12 hours)'
expect(Utils).to receive(:puts).with(output)
@ -192,7 +192,7 @@ describe Utils do
'ip' => '127.0.0.1',
'domain' => 'delivery.mycompany.net'
}}
output = "- aiydvzpg23r415q.delivery.mycompany.net (redhat-7-x86_64, 7.67/48 hours, user: bob, role: agent)"
output = '- aiydvzpg23r415q.delivery.mycompany.net (redhat-7-x86_64, 7.67/48 hours, user: bob, role: agent)'
expect(Utils).to receive(:puts).with(output)
@ -205,7 +205,7 @@ describe Utils do
end
it 'prints a nonstandard pooler output with host, template, and time remaining' do
hostname = "sol11-9.delivery.mycompany.net"
hostname = 'sol11-9.delivery.mycompany.net'
response_body = { hostname => {
'fqdn' => hostname,
'os_triple' => 'solaris-11-sparc',
@ -213,7 +213,7 @@ describe Utils do
'reserved_for_reason' => '',
'hours_left_on_reservation' => 35.89
}}
output = "- sol11-9.delivery.mycompany.net (solaris-11-sparc, 35.89h remaining)"
output = '- sol11-9.delivery.mycompany.net (solaris-11-sparc, 35.89h remaining)'
expect(Utils).to receive(:puts).with(output)
@ -234,7 +234,7 @@ describe Utils do
'reserved_for_reason' => 'testing',
'hours_left_on_reservation' => 35.89
}}
output = "- sol11-9.delivery.mycompany.net (solaris-11-sparc, 35.89h remaining, reason: testing)"
output = '- sol11-9.delivery.mycompany.net (solaris-11-sparc, 35.89h remaining, reason: testing)'
expect(Utils).to receive(:puts).with(output)