Merge branch '0.5' into develop

Conflicts:
	provider_base/services/tor.json

Change-Id: I826579945a0d93c43384f0fd12c9833762b084cf

1 files changed, 15 insertions, 0 deletions

diff --git a/tests/order.rb b/tests/order.rb
new file mode 100644
index 00000000..ffa6ae4e
--- /dev/null
+++ b/tests/order.rb
@@ -0,0 +1,15 @@
+class LeapCli::Config::Node
+  #
+  # returns a list of node names that should be tested before this node.
+  # make sure to not return ourselves (please no dependency loops!).
+  #
+  def test_dependencies
+    dependents = LeapCli::Config::ObjectList.new
+    unless services.include?('couchdb')
+      if services.include?('webapp') || services.include?('mx') || services.include?('soledad')
+        dependents.merge! nodes_like_me[:services => 'couchdb']
+      end
+    end
+    dependents.keys.delete_if {|name| self.name == name}
+  end
+end
\ No newline at end of file