diff --git a/Makefile b/Makefile index 119159485..1cd9d4d4e 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: clean pep8 lint test coverage +.PHONY: clean pep8 lint test clean: rm -fr build @@ -14,7 +14,7 @@ lint: pylint -E telegram test: - python tests/run.py + nosetests help: @echo "Available targets:" diff --git a/tests/run.py b/tests/run.py deleted file mode 100644 index 3b7dd1ba9..000000000 --- a/tests/run.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# -# A library that provides a Python interface to the Telegram Bot API -# Copyright (C) 2015 Leandro Toledo de Souza -# -# This program 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. -# -# This program 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 this program. If not, see [http://www.gnu.org/licenses/]. - -import os -import glob -import unittest - -suite = unittest.TestSuite() -for test_file in glob.glob('tests/test_*.py'): - test_module = os.path.basename(test_file).replace('.py', '') - suite.addTest(unittest.defaultTestLoader.loadTestsFromName(test_module)) - -unittest.TextTestRunner().run(suite)