make build test work (or fail, but work) again

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-10-04 16:15:10 +02:00
parent 3d75ec9bfc
commit 40a1619c1a
3 changed files with 56 additions and 2 deletions

View file

@ -127,7 +127,8 @@ case "$1" in
;;
test)
python3 -m unittest discover lib/cdist/test 'test_*.py'
PYTHONPATH=$PYTHONPATH:$(pwd -P)/lib \
python3 -m cdist.test
;;
test-install)
@ -136,6 +137,7 @@ case "$1" in
;;
test-all)
PYTHONPATH=$PYTHONPATH:$(pwd -P)/lib \
python3 -m unittest discover lib/cdist/test '*.py'
;;

View file

@ -0,0 +1,47 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
# 2011 Nico Schottelius (nico-cdist at schottelius.org)
#
# This file is part of cdist.
#
# cdist is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# cdist is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
#
#
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"))
def exec():
print(cdist_exec_path)
#class UI(unittest.TestCase):
# def test_banner(self):
# self.assertEqual(subprocess.call([cdist_exec_path, "banner"]), 0)
#
# def test_help(self):
# for cmd in cdist_commands:
# self.assertEqual(subprocess.call([cdist_exec_path, cmd, "-h"]), 0)
#
# # FIXME: mockup needed
# def test_config_localhost(self):
# for cmd in cdist_commands:
# self.assertEqual(subprocess.call([cdist_exec_path, "config", "localhost"]), 0)

View file

@ -21,8 +21,10 @@
#
import os
import sys
import cdist.test
import unittest
#class UI(unittest.TestCase):
# def test_banner(self):
@ -39,3 +41,6 @@ import cdist.test
print(cdist.test.cdist_exec_path)
print(sys.argv)
suite = unittest.defaultTestLoader.discover(os.path.dirname(__file__))
unittest.TextTestRunner(verbosity=1).run(suite)