Merge "Optimize kitchen tests for Travis CI"
diff --git a/postgresql/cluster/hot-standby/slave.sls b/postgresql/cluster/hot-standby/slave.sls
index cee0857..70a490f 100644
--- a/postgresql/cluster/hot-standby/slave.sls
+++ b/postgresql/cluster/hot-standby/slave.sls
@@ -31,7 +31,7 @@
restore_postgresql_cluster:
cmd.run:
- names:
- - pg_basebackup --host {{ cluster.master.host }} -U {{ cluster.master.user }} --xlog-method=stream -D {{ cluster.dir.data }} -w -d "password={{ cluster.master.password }}" -v && touch {{ cluster.dir.data }}/cluster-created
+ - pg_basebackup --host {{ cluster.master.host }} --port {{ cluster.master.get("port", 5432) }} -U {{ cluster.master.user }} --xlog-method=stream -D {{ cluster.dir.data }} -w -d "password={{ cluster.master.password }}" -v && touch {{ cluster.dir.data }}/cluster-created
- unless: "[ -f {{ cluster.dir.data }}/cluster-created ]"
- user: postgres
- cwd: /var/lib/postgresql
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 29fb975..4ee4e0f 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -124,7 +124,7 @@
}
salt_run() {
- [ -e ${VEN_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
+ [ -e ${VENV_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
salt-call ${SALT_OPTS} $*
}