Skip to content
Permalink
Browse files

OS X -> macOS [Closes #30313]

[Jon Moss & Xavier Noria]
  • Loading branch information...
fxn committed Jun 23, 2018
1 parent 484f970 commit 96d2c228e31e5fe9b3159c5c52051c589d3c384f
@@ -151,7 +151,7 @@ def test_statement_key_is_logged
# When prompted, restart the PostgreSQL server with the
# "-m fast" option or kill the individual connection assuming
# you know the incantation to do that.
# To restart PostgreSQL 9.1 on OS X, installed via MacPorts, ...
# To restart PostgreSQL 9.1 on macOS, installed via MacPorts, ...
# sudo su postgres -c "pg_ctl restart -D /opt/local/var/db/postgresql91/defaultdb/ -m fast"
def test_reconnection_after_actual_disconnection_with_verify
original_connection_pid = @connection.query("select pg_backend_pid()")
@@ -633,9 +633,9 @@ $ cat config/database.yml
#
# Install the pg driver:
# gem install pg
# On OS X with Homebrew:
# On macOS with Homebrew:
# gem install pg -- --with-pg-config=/usr/local/bin/pg_config
# On OS X with MacPorts:
# On macOS with MacPorts:
# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
# On Windows:
# gem install pg
@@ -2,9 +2,9 @@
#
# Install the pg driver:
# gem install pg
# On OS X with Homebrew:
# On macOS with Homebrew:
# gem install pg -- --with-pg-config=/usr/local/bin/pg_config
# On OS X with MacPorts:
# On macOS with MacPorts:
# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
# On Windows:
# gem install pg
@@ -76,7 +76,7 @@ def loader.find_executables; end

# Compare the realpath in case either of them has symlinks.
#
# This happens in particular in Mac OS X, where @tmp starts
# This happens in particular in macOS, where @tmp starts
# with "/var", and Dir.pwd with "/private/var", due to a
# default system symlink var -> private/var.
assert_equal File.realpath("#@tmp/foo"), File.realpath(Dir.pwd)

0 comments on commit 96d2c22

Please sign in to comment.
You can’t perform that action at this time.