Fix specs for #567
This commit is contained in:
parent
c58f327f46
commit
c323cea12a
3 changed files with 3 additions and 3 deletions
|
@ -46,7 +46,7 @@ describe 'postgresql::server', :type => :class do
|
||||||
"PGPASSWORD='new-p@s$word-to-set'",
|
"PGPASSWORD='new-p@s$word-to-set'",
|
||||||
"NEWPASSWD_ESCAPED='$$new-p@s$word-to-set$$'"
|
"NEWPASSWD_ESCAPED='$$new-p@s$word-to-set$$'"
|
||||||
],
|
],
|
||||||
'unless' => "/usr/bin/psql -h localhost -c 'select 1' > /dev/null",
|
'unless' => "/usr/bin/psql -h localhost -p 5432 -c 'select 1' > /dev/null",
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -73,7 +73,7 @@ describe Puppet::Type.type(:postgresql_psql).provider(:ruby) do
|
||||||
it "executes with the given port" do
|
it "executes with the given port" do
|
||||||
expect(provider).to receive(:run_command).with(["psql",
|
expect(provider).to receive(:run_command).with(["psql",
|
||||||
"-p", "5555",
|
"-p", "5555",
|
||||||
"-t", "-c", "SELECT something"],
|
"-t", "-c", "\"SELECT something\""],
|
||||||
"postgres", "postgres")
|
"postgres", "postgres")
|
||||||
|
|
||||||
provider.run_sql_command("SELECT something")
|
provider.run_sql_command("SELECT something")
|
||||||
|
|
|
@ -35,7 +35,7 @@ def | | physical | | | t | | | 0/
|
||||||
provider.class.expects(:run_command).with(
|
provider.class.expects(:run_command).with(
|
||||||
['psql', '-t', '-c', 'SELECT * FROM pg_replication_slots;'],
|
['psql', '-t', '-c', 'SELECT * FROM pg_replication_slots;'],
|
||||||
'postgres', 'postgres').returns([sql_instances, nil])
|
'postgres', 'postgres').returns([sql_instances, nil])
|
||||||
instances = type.instances
|
instances = provider.class.instances
|
||||||
expect(instances.size).to eq 2
|
expect(instances.size).to eq 2
|
||||||
expect(instances[0].name).to eq 'abc'
|
expect(instances[0].name).to eq 'abc'
|
||||||
expect(instances[1].name).to eq 'def'
|
expect(instances[1].name).to eq 'def'
|
||||||
|
|
Loading…
Reference in a new issue