From 7818abd6a89a882cabb3d2a14a572308d9e959ff Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Tue, 21 Jun 2016 17:38:00 -0700
Subject: minor ruby linting

---
 bin/run_tests | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/run_tests')

diff --git a/bin/run_tests b/bin/run_tests
index b6784ed5..b25a419c 100755
--- a/bin/run_tests
+++ b/bin/run_tests
@@ -459,7 +459,7 @@ end
 
 def main
   # load node data from hiera file
-  if File.exists?(HIERA_FILE)
+  if File.exist?(HIERA_FILE)
     $node = YAML.load_file(HIERA_FILE)
   else
     $node = {"services" => [], "dummy" => true}
-- 
cgit v1.2.3


From 07c0e60e6bdc5b8bfe1f42f76dae9f0a79e7abb0 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Mon, 29 Aug 2016 16:35:14 -0700
Subject: moved infrastructure tests run by `leap run` to tests/server-tests

---
 bin/run_tests | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'bin/run_tests')

diff --git a/bin/run_tests b/bin/run_tests
index b25a419c..8450a9bf 100755
--- a/bin/run_tests
+++ b/bin/run_tests
@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 
 #
-# this script will run the unit tests in ../tests/*.rb.
+# This script will run the unit tests in /srv/leap/tests
 #
 # Tests for the platform differ from traditional ruby unit tests in a few ways:
 #
@@ -29,11 +29,11 @@ EXIT_CODES = {
 
 HIERA_FILE   = '/etc/leap/hiera.yaml'
 HELPER_PATHS = [
-  '../../tests/helpers/*.rb',
+  '/srv/leap/tests/server-tests/helpers/*.rb',
   '/srv/leap/files/tests/helpers/*.rb'
 ]
 TEST_PATHS   = [
-  '../../tests/white-box/*.rb',
+  '/srv/leap/tests/server-tests/white-box/*.rb',
   '/srv/leap/files/tests/white-box/*.rb',
   '/srv/leap/tests_custom/*.rb'
 ]
-- 
cgit v1.2.3