Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Fix specs for #567
  • Loading branch information
hunner committed Mar 13, 2015
commit c323cea12a8f34b34953147b768cec0a4335b982
2 changes: 1 addition & 1 deletion spec/unit/classes/server_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"PGPASSWORD='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
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/puppet/provider/postgresql_psql/ruby_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
it "executes with the given port" do
expect(provider).to receive(:run_command).with(["psql",
"-p", "5555",
"-t", "-c", "SELECT something"],
"-t", "-c", "\"SELECT something\""],
"postgres", "postgres")

provider.run_sql_command("SELECT something")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def success?
provider.class.expects(:run_command).with(
['psql', '-t', '-c', 'SELECT * FROM pg_replication_slots;'],
'postgres', 'postgres').returns([sql_instances, nil])
instances = type.instances
instances = provider.class.instances
expect(instances.size).to eq 2
expect(instances[0].name).to eq 'abc'
expect(instances[1].name).to eq 'def'
Expand Down