Commit e7e18db7 authored by Jeremy Hylton's avatar Jeremy Hylton

zeoup now writes an object in the root to test transaction commit.

The --nowrite option will disable writing.  (It's not possible to
enable writing and disable reading, so that's the only option.)
parent 028a8c94
...@@ -3,6 +3,12 @@ ...@@ -3,6 +3,12 @@
Usage: zeoup.py [options] Usage: zeoup.py [options]
The test will connect to a ZEO server, load the root object, and
attempt to update the zeoup counter in the root. It will report
success if it updates to counter or if it gets a ConflictError. A
ConflictError is considered a success, because the client was able to
start a transaction.
Options: Options:
-p port -- port to connect to -p port -- port to connect to
...@@ -11,6 +17,8 @@ Options: ...@@ -11,6 +17,8 @@ Options:
-U path -- Unix-domain socket to connect to -U path -- Unix-domain socket to connect to
--nowrite -- Do not update the zeoup counter.
You must specify either -p and -h or -U. You must specify either -p and -h or -U.
""" """
...@@ -19,9 +27,10 @@ import socket ...@@ -19,9 +27,10 @@ import socket
import sys import sys
import ZODB import ZODB
from ZODB.POSException import ConflictError
from ZEO.ClientStorage import ClientStorage from ZEO.ClientStorage import ClientStorage
def check_server(addr, storage): def check_server(addr, storage, write):
cs = ClientStorage(addr, storage=storage, debug=1, cs = ClientStorage(addr, storage=storage, debug=1,
wait_for_server_on_startup=0) wait_for_server_on_startup=0)
# _startup() is an artifact of the way ZEO 1.0 works. The # _startup() is an artifact of the way ZEO 1.0 works. The
...@@ -32,6 +41,15 @@ def check_server(addr, storage): ...@@ -32,6 +41,15 @@ def check_server(addr, storage):
# XXX Is connecting a DB with wait_for_server_on_startup=0 a # XXX Is connecting a DB with wait_for_server_on_startup=0 a
# sufficient test for upness? # sufficient test for upness?
db = ZODB.DB(cs) db = ZODB.DB(cs)
cn = db.open()
root = cn.root()
if write:
try:
root['zeoup'] = root.get('zeoup', 0)+ 1
get_transaction().commit()
except ConflictError:
pass
cn.close()
db.close() db.close()
def usage(exit=1): def usage(exit=1):
...@@ -43,9 +61,11 @@ def main(): ...@@ -43,9 +61,11 @@ def main():
host = None host = None
port = None port = None
unix = None unix = None
write = 1
storage = '1' storage = '1'
try: try:
opts, args = getopt.getopt(sys.argv[1:], 'p:h:U:S:') opts, args = getopt.getopt(sys.argv[1:], 'p:h:U:S:',
['nowrite'])
for o, a in opts: for o, a in opts:
if o == '-p': if o == '-p':
port = int(a) port = int(a)
...@@ -55,6 +75,8 @@ def main(): ...@@ -55,6 +75,8 @@ def main():
unix = a unix = a
elif o == '-S': elif o == '-S':
storage = a storage = a
elif o == '--nowrite':
write = 0
except Exception, err: except Exception, err:
print err print err
usage() usage()
...@@ -68,7 +90,7 @@ def main(): ...@@ -68,7 +90,7 @@ def main():
usage() usage()
addr = host, port addr = host, port
check_server(addr, storage) check_server(addr, storage, write)
if __name__ == "__main__": if __name__ == "__main__":
try: try:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment