Commit Graph

100 Commits

Author SHA1 Message Date
Brian Granger
5f4dfb3d53 Merging upstream change from module-reorg branch.
Recently lp:ipython was merged into module-reorg.  This is propagating
that merge into this inputhook branch.
2009-08-04 11:19:33 -07:00
Brian Granger
d2126ac322 Merging -r 1196 from lp:ipython.
A couple of issues came up:

* Some tests in testing and frontend rely on twisted, but are being
  tested with nose.  This is bad!  We currently have hackish logic in
  iptest to skip these if twisted is not installed, but if it is we
  are testing them with nose!
* Some modules (engineservice, kernel/error, newserialized) have nose
  skip logic even though they should never be tested with nose.
* When trial is run on testStrictDict we get an uncaught error.

testStrictDict ... ERROR: An unexpected error occurred while tokenizing 
input The following traceback may be corrupted or invalid
The error message is: ('EOF in multi-line statement', (37, 0))
2009-08-04 09:50:23 -07:00
Brian Granger
551b819cd4 Merging -r 1185 from lp:ipython. 2009-08-03 23:52:39 -07:00
Fernando Perez
2f50493d06 Fixes so the test suite runs when Twisted is not available.
Other minor cleanups (formatting and unused imports)
2009-08-03 18:18:28 -07:00
Brian Granger
acc15a048b Merging -r 1177 from lp:ipython with fixes and resolutions.
The main conflicts I had to fix were in ultratb.  I have removed
the ultraTB.py in IPython/kernel/core.  Now IPython/core/ultratb.py
is being used everywhere.  Also I have protected the calls to ipapi.get
to see if None is returned.  This happens when trial IPython.kernel
is run.
2009-08-03 12:50:56 -07:00
Fernando Perez
f64ae7afe9 Make iptest more reliable under Win32.
This ensures the trial part of the tests runs in win32.
2009-08-01 17:08:32 -07:00
Fernando Perez
0331faae06 Small fixes for wx-dependent tests and include clearcmd.
Check that wx.aui can be imported and otherwise exclude modules that use it to
avoid errors when loading the test suite.

Also, do load clearcmd so that the tests for %clear do work.
2009-07-29 02:13:26 -07:00
Brian Granger
4e709cd95d Updated iptest to skip inputhook*.py files for doctesting. 2009-07-27 15:52:00 -07:00
Brian Granger
58e345c261 Refactored iptest.py to work with new package org.
In the process I had to fix 2 small bugs to get all the tests passing.
2009-07-27 15:38:27 -07:00
Brian Granger
6221939722 Renaming Extensions=>extensions in code and imports. 2009-07-20 15:16:34 -07:00
Brian Granger
f53e35c98b UserConfig => config/userconfig and imports updated. 2009-07-02 12:04:09 -07:00
Brian Granger
629dabdeab upgrade_dir.py => utils/upgradedir.py and updated imports. 2009-07-02 11:32:19 -07:00
Brian Granger
8bdec3ecc8 ultraTB.py => core/ultratb.py and imports updated. 2009-07-02 10:46:01 -07:00
Brian Granger
a522e6f6fd Shell.py => core/shell.py and imports updated. 2009-07-02 10:35:51 -07:00
Brian Granger
7c088ae84a Release.py => core/release.py and imports updated. 2009-07-02 09:59:43 -07:00
Brian Granger
c2b67757f4 Prompts.py => core/prompts.py and imports updated. 2009-07-02 09:35:38 -07:00
Brian Granger
d24aa6729d All platutils modules to utils, moved tests and updated imports. 2009-07-02 09:26:42 -07:00
Brian Granger
a86437a272 OutputTrap.py => core/outputtrap.py and updated imports. 2009-07-02 09:21:53 -07:00
Brian Granger
96372896a0 OInspect.py => core/oinspect.py and imports updated. 2009-07-02 09:19:02 -07:00
Brian Granger
93ff33a755 Magic.py => core/magic.py and imports updated. 2009-07-02 09:14:59 -07:00
Brian Granger
9e7706b8e8 irunner.py => lib/irunner.py and imports updated. 2009-07-02 09:12:10 -07:00
Brian Granger
6f8009d88f Logger.py => core/logger.py and updated imports. 2009-07-01 22:24:01 -07:00
Brian Granger
d4c01d0407 FakeModule.py => core/fakemodule.py and updated tests and imports. 2009-07-01 17:07:30 -07:00
Brian Granger
32a5e3041d deep_reload.py =? lib/deepreload.py and imports updated. 2009-07-01 16:39:48 -07:00
Brian Granger
8221c8f920 Debugger.py => core/debugger.py and updated all imports. 2009-07-01 16:25:06 -07:00
Brian Granger
d0a609940a CrashHandler.py => core/crashhandler.py and updated all imports. 2009-07-01 16:14:57 -07:00
Brian Granger
6bc203735a ConfigLoader.py => config/configloader.py and updated all imports. 2009-07-01 16:12:15 -07:00
Brian Granger
bfd32c129b background_jobs.py => lib/backgroundjob.py and imports updated. 2009-07-01 15:59:42 -07:00
Brian Granger
f6061ca275 ColorANSI.py -> utils/coloransi.py and all imports updated. 2009-07-01 15:55:28 -07:00
Brian Granger
ed8ff9e4e0 Fixing small bug in iptest. Can now be run as "iptest". 2009-04-25 16:09:59 -07:00
Administrator
386c262e44 Merging changes from above. 2009-04-25 15:06:50 -07:00
Administrator
ff41bf1dc6 Added platutils.get_long_path_name to expand paths with "~" on win32.
This might be needed to fix ticket https://bugs.launchpad.net/bugs/366353
But, there are still problems with Magic.parse_options
2009-04-25 15:04:17 -07:00
Brian Granger
f97df71460 Adding comment about ticket https://bugs.launchpad.net/bugs/366982 2009-04-25 13:50:45 -07:00
Administrator
e6a9e402ff More fixes for testing on win32. 2009-04-25 13:19:34 -07:00
Brian Granger
db440afb0f Fixing tests in IPython.testing. 2009-04-25 12:50:43 -07:00
Administrator
e18c04f33a Fixing bugs with the testing system. 2009-04-25 12:27:03 -07:00
Administrator
f4d078c8be Fixing doctest EXCLUDES in iptest on win32.
The regular expressions we were using on win32 were not matching.  The
trick is to construct the regular expression with double \\ like this::

    re.compile('foo\\\\bar')

Arggg!!
2009-04-25 10:05:09 -07:00
Brian Granger
44f17cc75f Making the doctest exclude paths os independent. 2009-04-25 09:04:56 -07:00
Brian Granger
055c6cdcde Run the top level module tests in a single process. 2009-04-24 11:04:32 -07:00
Brian Granger
a96c333256 Merging Fernando's fixes from his trunk-dev and fixing testing things.
I have merged his changes with a few modifications.  I have also
removed IPython.kernel from the list of packages that nose will test.
2009-04-24 10:39:01 -07:00
Brian Granger
cbd271fb01 Refactored iptest to include the iptestall capabilities.
We not have a test suite that can be run with `iptest all`.  Give it a
shot!
2009-04-24 10:12:50 -07:00
Fernando Perez
cdac592b4e Reactivate --with-ipdoctest option by default, now that trial is isolated. 2009-04-23 15:29:27 -07:00
Fernando Perez
32edd98fbd Skip things we shouldn't be testing 2009-04-22 16:34:16 -07:00
Fernando Perez
75873476f5 - Make ipdoctest a little cleaner by giving it separate option names.
This is in an attempt at better isolating it from the rest of nose, because
we are seeing intermittent Twisted errors when it is enabled.  However, I
still see them sometimes.

- Also, make the reference counting tests a little less verbose.
2009-04-03 02:03:12 -07:00
Brian Granger
842130bd17 Temporarily disabling the ipdoctest nose plugin.
This plugin was causing problems with Twisted.  We need to go through
the plugin to find the source of the problem.  For now, our test suite
passes though.
2009-03-20 21:18:16 -07:00
Fernando Perez
d2f86cc9a4 Fix problems with multiline doctests and add docs about testing.
Also enabled some more testings that were blacklisted, now that the testing
machinery is more robust.
2009-03-15 18:38:04 -07:00
Fernando Perez
55b455032b Cleanup testing machinery. 2009-03-10 22:49:08 -07:00
Fernando Perez
07b2c09938 Update decorators and test scripts. 2009-03-10 13:02:00 -07:00
Fernando Perez
366ad68411 Fixes to testing system: ipdocetst plugin wasn't being properly loaded. 2008-11-08 21:54:34 -08:00
Fernando Perez
cc13fca3c2 Add module I forgot 2008-08-23 23:37:40 -07:00