diff options
author | Daniel Veillard <veillard@src.gnome.org> | 2003-05-15 22:11:36 +0000 |
---|---|---|
committer | Daniel Veillard <veillard@src.gnome.org> | 2003-05-15 22:11:36 +0000 |
commit | 781ac8b19bfc10635a8bb83158f874116fd7559e (patch) | |
tree | d4d835a320b96fd08c5dea232346e63cd20e9fb7 /python/tests | |
parent | 6f7e24bb7d94e2163ef26fdad860a3cd06116549 (diff) | |
download | libxml2-781ac8b19bfc10635a8bb83158f874116fd7559e.tar.gz |
patch from Stéphane Bidoul for setting up threads global defaults. this
* build_glob.py global.data globals.c parser.c
include/libxml/globals.h: patch from Stéphane Bidoul for setting
up threads global defaults.
* doc/libxml2-api.xml: this extends the API with new functions
* python/tests/Makefile.am python/tests/reader2.py
python/tests/thread2.py: integrated the associated testcase and
fixed the error string used in reader2
Daniel
Diffstat (limited to 'python/tests')
-rw-r--r-- | python/tests/Makefile.am | 3 | ||||
-rwxr-xr-x | python/tests/reader2.py | 4 | ||||
-rwxr-xr-x | python/tests/thread2.py | 96 |
3 files changed, 100 insertions, 3 deletions
diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am index 0c16acf0..d4e91dd5 100644 --- a/python/tests/Makefile.am +++ b/python/tests/Makefile.am @@ -28,7 +28,8 @@ PYTESTS= \ reader6.py \ ctxterror.py\ readererr.py\ - relaxng.py + relaxng.py \ + thread2.py XMLS= \ tst.xml \ diff --git a/python/tests/reader2.py b/python/tests/reader2.py index f8ca2541..afc3586a 100755 --- a/python/tests/reader2.py +++ b/python/tests/reader2.py @@ -14,10 +14,10 @@ libxml2.debugMemory(1) err="" expect="""../../test/valid/rss.xml:172: validity error: Element rss does not carry attribute version </rss> - ^ + ^ ../../test/valid/xlink.xml:450: validity error: ID dt-arc already defined <p><termdef id="dt-arc" term="Arc">An <ter - ^ + ^ ../../test/valid/xlink.xml:530: validity error: attribute def line 199 references an unknown ID "dt-xlg" ^ diff --git a/python/tests/thread2.py b/python/tests/thread2.py new file mode 100755 index 00000000..c8ac5ed3 --- /dev/null +++ b/python/tests/thread2.py @@ -0,0 +1,96 @@ +#!/usr/bin/python -u +import string, sys, time +import thread +from threading import Thread, Lock + +import libxml2 + +THREADS_COUNT = 15 + +failed = 0 + +class ErrorHandler: + + def __init__(self): + self.errors = [] + self.lock = Lock() + + def handler(self,ctx,str): + self.lock.acquire() + self.errors.append(str) + self.lock.release() + +def getLineNumbersDefault(): + old = libxml2.lineNumbersDefault(0) + libxml2.lineNumbersDefault(old) + return old + +def test(expectedLineNumbersDefault): + time.sleep(1) + global failed + # check a per thread-global + if expectedLineNumbersDefault != getLineNumbersDefault(): + failed = 1 + print "FAILED to obtain correct value for " \ + "lineNumbersDefault in thread %d" % thread.get_ident() + # check ther global error handler + # (which is NOT per-thread in the python bindings) + try: + doc = libxml2.parseFile("bad.xml") + except: + pass + else: + assert "failed" + +# global error handler +eh = ErrorHandler() +libxml2.registerErrorHandler(eh.handler,"") + +# set on the main thread only +libxml2.lineNumbersDefault(1) +test(1) +ec = len(eh.errors) +if ec == 0: + print "FAILED: should have obtained errors" + sys.exit(1) + +ts = [] +for i in range(THREADS_COUNT): + # expect 0 for lineNumbersDefault because + # the new value has been set on the main thread only + ts.append(Thread(target=test,args=(0,))) +for t in ts: + t.start() +for t in ts: + t.join() + +if len(eh.errors) != ec+THREADS_COUNT*ec: + print "FAILED: did not obtain the correct number of errors" + sys.exit(1) + +# set lineNumbersDefault for future new threads +libxml2.thrDefLineNumbersDefaultValue(1) +ts = [] +for i in range(THREADS_COUNT): + # expect 1 for lineNumbersDefault + ts.append(Thread(target=test,args=(1,))) +for t in ts: + t.start() +for t in ts: + t.join() + +if len(eh.errors) != ec+THREADS_COUNT*ec*2: + print "FAILED: did not obtain the correct number of errors" + sys.exit(1) + +if failed: + print "FAILED" + sys.exit(1) + +# Memory debug specific +libxml2.cleanupParser() +if libxml2.debugMemory(1) == 0: + print "OK" +else: + print "Memory leak %d bytes" % (libxml2.debugMemory(1)) + libxml2.dumpMemory() |