From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Thu, 6 Aug 2015 17:10:46 +0000 (+0200)
Subject: tests: added block module to tests
X-Git-Tag: v1.0.0-beta1~58^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e89cc876ecf7a826d435c69af694dcde75878e8d;p=thirdparty%2Fknot-resolver.git

tests: added block module to tests
---

diff --git a/scripts/bootstrap-depends.sh b/scripts/bootstrap-depends.sh
index 1122ee22c..21b811fee 100755
--- a/scripts/bootstrap-depends.sh
+++ b/scripts/bootstrap-depends.sh
@@ -91,7 +91,7 @@ if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
 fi
 if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
 	pkg cwrap ${CWRAP_URL} ${CWRAP_TAG} lib/pkgconfig/socket_wrapper.pc
-	pip install --user ${USER} -r ${PIP_PKGS}
+	pip install --user ${USER} -r ${PIP_PKGS} || true
 	rm ${HOME}/.cache/pip/log/debug.log || true
 fi
 
@@ -113,7 +113,7 @@ pkg cmocka ${CMOCKA_URL} ${CMOCKA_TAG} include/cmocka.h
 # libuv
 pkg libuv ${LIBUV_URL} ${LIBUV_TAG} include/uv.h --disable-static
 # luajit
-pkg lua ${LUA_URL} ${LUA_TAG} include/lua.h install LDFLAGS=-lm PREFIX=${PREFIX}
+pkg lua ${LUA_URL} ${LUA_TAG} lib/pkgconfig/luajit.pc install LDFLAGS=-lm PREFIX=${PREFIX}
 
 # remove on successful build
 rm -rf ${BUILD_DIR}
diff --git a/tests/kresd.j2 b/tests/kresd.j2
index e2d1747e6..2795d4943 100644
--- a/tests/kresd.j2
+++ b/tests/kresd.j2
@@ -1,6 +1,6 @@
 net.listen('{{SELF_ADDR}}',53)
 cache.size = 10*MB
-modules = {'hints'}
+modules = {'block','hints'}
 hints.root({['k.root-servers.net'] = '{{ROOT_ADDR}}'})
 option('NO_MINIMIZE', {{NO_MINIMIZE}})
 option('ALLOW_LOCAL', true)
diff --git a/tests/pydnstest/test.py b/tests/pydnstest/test.py
index afbe66d98..3d0e0ff25 100644
--- a/tests/pydnstest/test.py
+++ b/tests/pydnstest/test.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+import traceback
 
 class Test:
     """ Small library to imitate CMocka output. """
@@ -25,7 +26,7 @@ class Test:
                 passed += 1
                 print('[       OK ] %s' % name)
             except Exception as e:
-                print('[     FAIL ] %s (%s)' % (name, str(e)))
+                print('[     FAIL ] %s (%s) at %s' % (name, str(e), traceback.print_exc()[0]))
 
         # Clear test set
         self.tests = []
@@ -35,4 +36,4 @@ class Test:
             return 0
         else:
             print('[  FAILED  ] %d test(s).' % (planned - passed))
-            return 1
\ No newline at end of file
+            return 1
diff --git a/tests/test_integration.py b/tests/test_integration.py
index 9914bcdcd..1ed977cbc 100755
--- a/tests/test_integration.py
+++ b/tests/test_integration.py
@@ -245,8 +245,6 @@ def play_object(path, binary_name, config_name, j2template, binary_additional_pa
     server.start()
     try:
         server.play()
-    except Exception as e:
-        print('... scenario "%s" crashed, logs in "%s"' % (os.path.basename(path), TMPDIR))
     finally:
         server.stop()
         daemon_proc.terminate()