From 9d1a02ce335be34d31274797ce3d53012e28e22b Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Fri, 3 Jan 1997 22:42:08 +0000 Subject: Some small changes. Raise ImportError instead of SystemExit when $DISPLAY is not set, so regrtest.py will do the right thing. Add a call to gl.clear() to clear the window before drawing in it. Add some verbose prints for completeness. Use gl.v2i() for the coordinates of one of the lines, for a little bit of variety. Reduce the time the window is displayed from 5 to 2 seconds. --- Lib/test/test_gl.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_gl.py b/Lib/test/test_gl.py index 7e9c31c..d4e4d28 100755 --- a/Lib/test/test_gl.py +++ b/Lib/test/test_gl.py @@ -87,7 +87,8 @@ def main(): try: display = os.environ['DISPLAY'] except: - raise SystemExit + # Raise ImportError because regrtest.py handles it specially. + raise ImportError, "No $DISPLAY -- skipping gl test" # touch all the attributes of gl without doing anything if verbose: @@ -109,6 +110,9 @@ def main(): print 'winopen "CrissCross"' w = gl.winopen('CrissCross') if verbose: + print 'clear' + gl.clear() + if verbose: print 'ortho2' gl.ortho2(0.0, 400.0, 0.0, 400.0) if verbose: @@ -130,12 +134,18 @@ def main(): if verbose: print 'bgnline' gl.bgnline() - gl.v2f(400.0, 0.0) - gl.v2f(0.0, 400.0) if verbose: - print 'Displaying window for 5 seconds...' + print 'v2i' + gl.v2i(400, 0) + gl.v2i(0, 400) + if verbose: + print 'endline' gl.endline() - time.sleep(5) + if verbose: + print 'Displaying window for 2 seconds...' + time.sleep(2) + if verbose: + print 'winclose' gl.winclose(w) main() -- cgit v0.12