From 933b1e987bbb6898324fa2f78c7c0f9606702e2f 2008-07-07 02:00:25 From: Fernando Perez Date: 2008-07-07 02:00:25 Subject: [PATCH] More testing cleanup... --- diff --git a/IPython/tools/tests/__init__.py b/IPython/tools/tests/__init__.py deleted file mode 100644 index f751f68..0000000 --- a/IPython/tools/tests/__init__.py +++ /dev/null @@ -1,10 +0,0 @@ -# encoding: utf-8 -__docformat__ = "restructuredtext en" -#------------------------------------------------------------------------------- -# Copyright (C) 2005 Fernando Perez -# Brian E Granger -# Benjamin Ragan-Kelley -# -# Distributed under the terms of the BSD License. The full license is in -# the file COPYING, distributed as part of this software. -#------------------------------------------------------------------------------- diff --git a/IPython/tools/tests/test_tools_utils.py b/IPython/tools/tests/test_tools_utils.py deleted file mode 100755 index 61ec558..0000000 --- a/IPython/tools/tests/test_tools_utils.py +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env python -"""Testing script for the tools.utils module. -""" - -# Module imports -from IPython.testing import tcommon -from IPython.testing.tcommon import * - -# If you have standalone doctests in a separate file, set their names in the -# dt_files variable (as a single string or a list thereof). The mkPath call -# forms an absolute path based on the current file, it is not needed if you -# provide the full pahts. -dt_files = fullPath(__file__,['tst_tools_utils_doctest.txt', - 'tst_tools_utils_doctest2.txt']) - -# If you have any modules whose docstrings should be scanned for embedded tests -# as examples accorging to standard doctest practice, set them here (as a -# single string or a list thereof): -dt_modules = 'IPython.tools.utils' - -########################################################################## -### Regular unittest test classes go here - -## class utilsTestCase(unittest.TestCase): -## def test_foo(self): -## pass - -########################################################################## -### Main -# This ensures that the code will run either standalone as a script, or that it -# can be picked up by Twisted's `trial` test wrapper to run all the tests. -if tcommon.pexpect is not None: - if __name__ == '__main__': - unittest.main(testLoader=IPDocTestLoader(dt_files,dt_modules)) - else: - testSuite = lambda : makeTestSuite(__name__,dt_files,dt_modules) diff --git a/IPython/tools/tests/tst_tools_utils_doctest2.txt b/IPython/tools/tests/test_tools_utils.txt similarity index 57% rename from IPython/tools/tests/tst_tools_utils_doctest2.txt rename to IPython/tools/tests/test_tools_utils.txt index 1ccea08..60235bc 100644 --- a/IPython/tools/tests/tst_tools_utils_doctest2.txt +++ b/IPython/tools/tests/test_tools_utils.txt @@ -3,40 +3,15 @@ ========================================= The way doctest loads these, the entire document is applied as a single test -rather than multiple individual ones, unfortunately. +rather than multiple individual ones, unfortunately:: - -Auto-generated tests -==================== - - ----------------------------------------------------------------------------- - -Begin included file tst_tools_utils_doctest2.py:: - - # Setup - all imports are done in tcommon - >>> from IPython.testing import tcommon - >>> from IPython.testing.tcommon import * - - # Doctest code begins here >>> from IPython.tools import utils - + # Some other tests for utils - + >>> utils.marquee('Testing marquee') '****************************** Testing marquee ******************************' - + >>> utils.marquee('Another test',30,'.') '........ Another test ........' - - -End included file tst_tools_utils_doctest2.py - ----------------------------------------------------------------------------- - - - -Manually generated tests -======================== -These are one-off tests written by hand, copied from an interactive prompt. diff --git a/IPython/tools/tests/tst_tools_utils_doctest.py b/IPython/tools/tests/tst_tools_utils_doctest.py deleted file mode 100644 index bb0abe5..0000000 --- a/IPython/tools/tests/tst_tools_utils_doctest.py +++ /dev/null @@ -1,12 +0,0 @@ -# Setup - all imports are done in tcommon -from IPython.testing import tcommon -from IPython.testing.tcommon import * - -# Doctest code begins here -from IPython.tools import utils - -for i in range(10): - print i, - print i+1 - -print 'simple loop is over' diff --git a/IPython/tools/tests/tst_tools_utils_doctest.tpl.txt b/IPython/tools/tests/tst_tools_utils_doctest.tpl.txt deleted file mode 100644 index 929d9c2..0000000 --- a/IPython/tools/tests/tst_tools_utils_doctest.tpl.txt +++ /dev/null @@ -1,18 +0,0 @@ -========================================= - Doctests for the ``tools.utils`` module -========================================= - -The way doctest loads these, the entire document is applied as a single test -rather than multiple individual ones, unfortunately. - - -Auto-generated tests -==================== - -%run tst_tools_utils_doctest.py - - -Manually generated tests -======================== - -These are one-off tests written by hand, copied from an interactive prompt. diff --git a/IPython/tools/tests/tst_tools_utils_doctest.txt b/IPython/tools/tests/tst_tools_utils_doctest.txt deleted file mode 100644 index 8873850..0000000 --- a/IPython/tools/tests/tst_tools_utils_doctest.txt +++ /dev/null @@ -1,42 +0,0 @@ - -========================= - Auto-generated doctests -========================= - -This file was auto-generated by IPython in its entirety. If you need finer -control over the contents, simply make a manual template. See the -mkdoctests.py script for details. - - ----------------------------------------------------------------------------- - -Begin included file tst_tools_utils_doctest.py:: - - # Setup - all imports are done in tcommon - >>> from IPython.testing import tcommon - >>> from IPython.testing.tcommon import * - - # Doctest code begins here - >>> from IPython.tools import utils - - >>> for i in range(10): - ... print i, - ... print i+1 - ... - 0 1 - 1 2 - 2 3 - 3 4 - 4 5 - 5 6 - 6 7 - 7 8 - 8 9 - 9 10 - >>> print 'simple loop is over' - simple loop is over - -End included file tst_tools_utils_doctest.py - ----------------------------------------------------------------------------- - diff --git a/IPython/tools/tests/tst_tools_utils_doctest2.py b/IPython/tools/tests/tst_tools_utils_doctest2.py deleted file mode 100644 index 4e6f3b2..0000000 --- a/IPython/tools/tests/tst_tools_utils_doctest2.py +++ /dev/null @@ -1,13 +0,0 @@ -# Setup - all imports are done in tcommon -from IPython.testing import tcommon -from IPython.testing.tcommon import * - -# Doctest code begins here -from IPython.tools import utils - -# Some other tests for utils - -utils.marquee('Testing marquee') - -utils.marquee('Another test',30,'.') - diff --git a/IPython/tools/tests/tst_tools_utils_doctest2.tpl.txt b/IPython/tools/tests/tst_tools_utils_doctest2.tpl.txt deleted file mode 100644 index d09f4c4..0000000 --- a/IPython/tools/tests/tst_tools_utils_doctest2.tpl.txt +++ /dev/null @@ -1,18 +0,0 @@ -========================================= - Doctests for the ``tools.utils`` module -========================================= - -The way doctest loads these, the entire document is applied as a single test -rather than multiple individual ones, unfortunately. - - -Auto-generated tests -==================== - -%run tst_tools_utils_doctest2.py - - -Manually generated tests -======================== - -These are one-off tests written by hand, copied from an interactive prompt.