From a53085cb16cc185c71b9043e7ee77eb62bef6dd5 Mon Sep 17 00:00:00 2001
From: jpic <jamespic@gmail.com>
Date: Fri, 15 May 2015 02:16:14 +0200
Subject: [PATCH] Bypass salt/top.sls

---
 .travis.yml       | 7 ++++---
 test/salt/top.sls | 4 ----
 2 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 100644 test/salt/top.sls

diff --git a/.travis.yml b/.travis.yml
index 1dbacf8..d0a3a0d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ env:
   global:
     - BS_PIP_ALLOWED=1
     - BS_ECHO_DEBUG=1
+    - SALT_ARGS="--local --retcode-passthrough --pillar-root=test/pillar --file-root=$PWD"
   matrix:
     - STATE=rsyncd
     - STATE=rsyncd.config
@@ -21,14 +22,14 @@ install:
   - sudo salt-call grains.items --local
 
 script:
-  - sudo salt-call state.show_sls $STATE --local --retcode-passthrough --config-dir=test/etc
-  - sudo salt-call state.sls $STATE --local --retcode-passthrough --config-dir=test/etc
+  - sudo salt-call state.show_sls $STATE $SALT_ARGS
+  - sudo salt-call state.sls $STATE $SALT_ARGS
 
   # For debugging purpose
   - cat /etc/default/rsync
   - test -f /etc/rsyncd.conf && cat /etc/rsyncd.conf || echo "No rsyncd.conf"
 
   # Idempotence check
-  - sudo salt-call state.sls $STATE --local --retcode-passthrough --config-dir=test/etc > /tmp/second
+  - sudo salt-call state.sls $STATE $SALT_ARGS > /tmp/second
   - cat /tmp/second
   - bash -c '! grep -q "^Not Run:" /tmp/second'
diff --git a/test/salt/top.sls b/test/salt/top.sls
deleted file mode 100644
index 755c05c..0000000
--- a/test/salt/top.sls
+++ /dev/null
@@ -1,4 +0,0 @@
-base:
-  '*':
-    - rsyncd
-    - rsyncd.config