commit 92294ff2af559d867e4475195a47dda293d6d444
author Martin819 <polreichmartin@gmail.com> Fri Feb 17 23:52:17 2017 +0100
committer Martin819 <polreichmartin@gmail.com> Fri Feb 17 23:57:06 2017 +0100
tree d6a43533ed010f8cb09d27e7f8830b96af8cacf9
parent 04aa7b4bc7a9e95a274b80bcb554acbf3c1a6121

Added Kitchen and Travis

tests/pillar/master_acl.sls

diff --git a/tests/pillar/master_acl.sls b/tests/pillar/master_acl.sls
index d457f5c..b33a3d7 100644
--- a/tests/pillar/master_acl.sls
+++ b/tests/pillar/master_acl.sls
@@ -6,6 +6,8 @@
     enabled: true
 salt:
   master:
+    command_timeout: 5
+    worker_threads: 2
     enabled: true
     source:
       engine: pkg

tests/pillar/master_api.sls

diff --git a/tests/pillar/master_api.sls b/tests/pillar/master_api.sls
index b5bd653..6be5097 100644
--- a/tests/pillar/master_api.sls
+++ b/tests/pillar/master_api.sls
@@ -6,6 +6,8 @@
     enabled: true
 salt:
   master:
+    command_timeout: 5
+    worker_threads: 2
     enabled: true
     source:
       engine: pkg

tests/pillar/master_cluster_failover.sls

diff --git a/tests/pillar/master_cluster_failover.sls b/tests/pillar/master_cluster_failover.sls
index 88229a0..216439c 100644
--- a/tests/pillar/master_cluster_failover.sls
+++ b/tests/pillar/master_cluster_failover.sls
@@ -6,6 +6,8 @@
     enabled: true
 salt:
   master:
+    command_timeout: 5
+    worker_threads: 2
     enabled: true
     source:
       engine: pkg

tests/pillar/master_custom_handler.sls

diff --git a/tests/pillar/master_custom_handler.sls b/tests/pillar/master_custom_handler.sls
index 80abf33..b07ea82 100644
--- a/tests/pillar/master_custom_handler.sls
+++ b/tests/pillar/master_custom_handler.sls
@@ -6,6 +6,8 @@
     enabled: true
 salt:
   master:
+    command_timeout: 5
+    worker_threads: 2
     enabled: true
     source:
       engine: pkg

tests/pillar/master_ssh_minion_key.sls

diff --git a/tests/pillar/master_ssh_minion_key.sls b/tests/pillar/master_ssh_minion_key.sls
index 86d328e..30cfb21 100644
--- a/tests/pillar/master_ssh_minion_key.sls
+++ b/tests/pillar/master_ssh_minion_key.sls
@@ -6,6 +6,8 @@
     enabled: true
 salt:
   master:
+    command_timeout: 5
+    worker_threads: 2
     enabled: true
     source:
       engine: pkg

tests/pillar/master_ssh_minion_password.sls

diff --git a/tests/pillar/master_ssh_minion_password.sls b/tests/pillar/master_ssh_minion_password.sls
index fcb0cd5..6ec5dfd 100644
--- a/tests/pillar/master_ssh_minion_password.sls
+++ b/tests/pillar/master_ssh_minion_password.sls
@@ -6,6 +6,8 @@
     enabled: true
 salt:
   master:
+    command_timeout: 5
+    worker_threads: 2
     enabled: true
     source:
       engine: pkg

tests/pillar/master_ssh_minion_root.sls

diff --git a/tests/pillar/master_ssh_minion_root.sls b/tests/pillar/master_ssh_minion_root.sls
index e12681f..c469318 100644
--- a/tests/pillar/master_ssh_minion_root.sls
+++ b/tests/pillar/master_ssh_minion_root.sls
@@ -6,6 +6,8 @@
     enabled: true
 salt:
   master:
+    command_timeout: 5
+    worker_threads: 2
     enabled: true
     source:
       engine: pkg

tests/pillar/salt_master_peer.sls

diff --git a/tests/pillar/salt_master_peer.sls b/tests/pillar/salt_master_peer.sls
deleted file mode 100644
index e69de29..0000000
--- a/tests/pillar/salt_master_peer.sls
+++ /dev/null