Merge "Optimize kitchen tests for Travis CI"
diff --git a/cassandra/files/backup/cassandra-backup-client-restore-call.sh b/cassandra/files/backup/cassandra-backup-client-restore-call.sh
index 292e707..f7bf241 100644
--- a/cassandra/files/backup/cassandra-backup-client-restore-call.sh
+++ b/cassandra/files/backup/cassandra-backup-client-restore-call.sh
@@ -1,4 +1,4 @@
-{%- from "cassandra/map.jinja" import backup with context %}
+{%- from "cassandra/map.jinja" import backup with context -%}
#!/bin/bash
# Script is to locally prepare appropriate backup to restore from local or remote location and call client-restore script in for loop with every keyspace
diff --git a/cassandra/files/backup/cassandra-backup-client-runner-call.sh b/cassandra/files/backup/cassandra-backup-client-runner-call.sh
index f6f9f05..a387107 100644
--- a/cassandra/files/backup/cassandra-backup-client-runner-call.sh
+++ b/cassandra/files/backup/cassandra-backup-client-runner-call.sh
@@ -1,4 +1,4 @@
-{%- from "cassandra/map.jinja" import backup with context %}
+{%- from "cassandra/map.jinja" import backup with context -%}
#!/bin/bash
# Script to call cassandra-backup-runner.sh in for loop to backup all keyspaces.
# This script is also able to rsync backed up data to remote host and perform clean up on historical backups
diff --git a/cassandra/files/backup/cassandra-backup-client-runner.sh b/cassandra/files/backup/cassandra-backup-client-runner.sh
index 50d0ed0..4652be6 100644
--- a/cassandra/files/backup/cassandra-backup-client-runner.sh
+++ b/cassandra/files/backup/cassandra-backup-client-runner.sh
@@ -1,4 +1,4 @@
-{%- from "cassandra/map.jinja" import backup with context %}
+{%- from "cassandra/map.jinja" import backup with context -%}
#!/bin/bash
# Script to backup Cassandra schema and create snapshot of keyspaces
diff --git a/cassandra/files/backup/cassandra-backup-server-restore-call.sh b/cassandra/files/backup/cassandra-backup-server-restore-call.sh
index 1afc60d..0ce1f48 100644
--- a/cassandra/files/backup/cassandra-backup-server-restore-call.sh
+++ b/cassandra/files/backup/cassandra-backup-server-restore-call.sh
@@ -1,4 +1,4 @@
-{%- from "cassandra/map.jinja" import backup with context %}
+{%- from "cassandra/map.jinja" import backup with context -%}
#!/bin/sh
# This script is called remotely by Cassandra 'client role' node and returns appropriate backup that client will restore
diff --git a/cassandra/files/backup/cassandra-backup-server-runner.sh b/cassandra/files/backup/cassandra-backup-server-runner.sh
index 63405c0..fa17caf 100644
--- a/cassandra/files/backup/cassandra-backup-server-runner.sh
+++ b/cassandra/files/backup/cassandra-backup-server-runner.sh
@@ -1,4 +1,4 @@
-{%- from "cassandra/map.jinja" import backup with context %}
+{%- from "cassandra/map.jinja" import backup with context -%}
#!/bin/bash
# Script to erase old backups on Cassandra 'server role' node.
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} $*
}