From cadb4fa852870f872fc65ea7e85680406eff20a5 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Sun, 2 Oct 2011 15:56:27 +0200
Subject: [PATCH] add test all and make ui tests work again

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 build.sh        | 4 ++++
 test/nico_ui.py | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 24c907e6..021fb480 100755
--- a/build.sh
+++ b/build.sh
@@ -130,6 +130,10 @@ case "$1" in
       python3 -m unittest discover test 'test_*.py' 
    ;;
 
+   test-all)
+      python3 -m unittest discover test '*.py' 
+   ;;
+
    *)
       echo ''
       echo 'Welcome to cdist!'
diff --git a/test/nico_ui.py b/test/nico_ui.py
index 4e5b1a17..8ce98043 100755
--- a/test/nico_ui.py
+++ b/test/nico_ui.py
@@ -21,10 +21,14 @@
 #
 
 
+import os
 import subprocess
+import unittest
+
+cdist_commands=["banner", "config", "install"]
 
 cdist_exec_path = os.path.abspath(
-    os.path.join(os.path.dirname(os.path.realpath(__file__)), "bin/cdist"))
+    os.path.join(os.path.dirname(os.path.realpath(__file__)), "../bin/cdist"))
 
 class UI(unittest.TestCase):
     def test_banner(self):