##// END OF EJS Templates
Removed the top-level iptest.py and INSTALLED logic....
Brian Granger -
r2507:3449d30c
parent child
Show More
@@ -649,3 +649,6 def launch_new_instance():
649 app = IPythonApp()
649 app = IPythonApp()
650 app.start()
650 app.start()
651
651
652
653 if __name__ == '__main__':
654 launch_new_instance()
@@ -17,6 +17,7 __test__ = {}
17 #-------------------------------------------------------------------------------
17 #-------------------------------------------------------------------------------
18 # Imports
18 # Imports
19 #-------------------------------------------------------------------------------
19 #-------------------------------------------------------------------------------
20
20 from IPython.kernel.core import error
21 from IPython.kernel.core import error
21
22
22 #-------------------------------------------------------------------------------
23 #-------------------------------------------------------------------------------
@@ -203,5 +204,4 def collect_exceptions(rlist, method):
203 raise CompositeError(msg, elist)
204 raise CompositeError(msg, elist)
204 except CompositeError, e:
205 except CompositeError, e:
205 raise e
206 raise e
206
207
207
@@ -70,12 +70,6 pjoin = path.join
70 # Globals
70 # Globals
71 #-----------------------------------------------------------------------------
71 #-----------------------------------------------------------------------------
72
72
73 # By default, we assume IPython has been installed. But if the test suite is
74 # being run from a source tree that has NOT been installed yet, this flag can
75 # be set to False by the entry point scripts, to let us know that we must call
76 # the source tree versions of the scripts which manipulate sys.path instead of
77 # assuming that things exist system-wide.
78 INSTALLED = True
79
73
80 #-----------------------------------------------------------------------------
74 #-----------------------------------------------------------------------------
81 # Warnings control
75 # Warnings control
@@ -132,8 +126,6 def report():
132
126
133 out = [ sys_info() ]
127 out = [ sys_info() ]
134
128
135 out.append('\nRunning from an installed IPython: %s\n' % INSTALLED)
136
137 avail = []
129 avail = []
138 not_avail = []
130 not_avail = []
139
131
@@ -255,17 +247,8 class IPTester(object):
255 """Create new test runner."""
247 """Create new test runner."""
256 p = os.path
248 p = os.path
257 if runner == 'iptest':
249 if runner == 'iptest':
258 if INSTALLED:
250 iptest_app = get_ipython_module_path('IPython.testing.iptest')
259 iptest_app = get_ipython_module_path('IPython.testing.iptest')
251 self.runner = pycmd2argv(iptest_app) + sys.argv[1:]
260 self.runner = pycmd2argv(iptest_app) + sys.argv[1:]
261 else:
262 # Find our own 'iptest' script OS-level entry point. Don't
263 # look system-wide, so we are sure we pick up *this one*. And
264 # pass through to subprocess call our own sys.argv
265 ippath = p.abspath(p.join(p.dirname(__file__),'..','..'))
266 script = p.join(ippath, 'iptest.py')
267 self.runner = pycmd2argv(script) + sys.argv[1:]
268
269 else:
252 else:
270 # For trial, it needs to be installed system-wide
253 # For trial, it needs to be installed system-wide
271 self.runner = pycmd2argv(p.abspath(find_cmd('trial')))
254 self.runner = pycmd2argv(p.abspath(find_cmd('trial')))
@@ -52,13 +52,6 from . import decorators as dec
52 # Globals
52 # Globals
53 #-----------------------------------------------------------------------------
53 #-----------------------------------------------------------------------------
54
54
55 # By default, we assume IPython has been installed. But if the test suite is
56 # being run from a source tree that has NOT been installed yet, this flag can
57 # be set to False by the entry point scripts, to let us know that we must call
58 # the source tree versions of the scripts which manipulate sys.path instead of
59 # assuming that things exist system-wide.
60 INSTALLED = True
61
62 # Make a bunch of nose.tools assert wrappers that can be used in test
55 # Make a bunch of nose.tools assert wrappers that can be used in test
63 # generators. This will expose an assert* function for each one in nose.tools.
56 # generators. This will expose an assert* function for each one in nose.tools.
64
57
@@ -207,17 +200,9 def ipexec(fname, options=None):
207 _ip = get_ipython()
200 _ip = get_ipython()
208 test_dir = os.path.dirname(__file__)
201 test_dir = os.path.dirname(__file__)
209
202
210 # Find the ipython script from the package we're using, so that the test
203 ipython_cmd = find_cmd('ipython')
211 # suite can be run from the source tree without an installed IPython
212 p = os.path
213 if INSTALLED:
214 ipython_cmd = find_cmd('ipython')
215 else:
216 ippath = p.abspath(p.join(p.dirname(__file__),'..','..'))
217 ipython_script = p.join(ippath, 'ipython.py')
218 ipython_cmd = 'python "%s"' % ipython_script
219 # Absolute path for filename
204 # Absolute path for filename
220 full_fname = p.join(test_dir, fname)
205 full_fname = os.path.join(test_dir, fname)
221 full_cmd = '%s %s %s' % (ipython_cmd, cmdargs, full_fname)
206 full_cmd = '%s %s %s' % (ipython_cmd, cmdargs, full_fname)
222 #print >> sys.stderr, 'FULL CMD:', full_cmd # dbg
207 #print >> sys.stderr, 'FULL CMD:', full_cmd # dbg
223 return getoutputerror(full_cmd)
208 return getoutputerror(full_cmd)
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now