May 2008 - rhmessaging-commits - Jboss List Archives

rhmessaging commits: r2028 - mgmt/cumin/python/cumin.

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2008-05-09 10:43:35 -0400 (Fri, 09 May 2008) New Revision: 2028 Modified: mgmt/cumin/python/cumin/test.py Log: Consolidate the logic to check post-processing form redirects Modified: mgmt/cumin/python/cumin/test.py =================================================================== --- mgmt/cumin/python/cumin/test.py 2008-05-09 13:00:43 UTC (rev 2027) +++ mgmt/cumin/python/cumin/test.py 2008-05-09 14:43:35 UTC (rev 2028) @@ -49,6 +49,18 @@ return page, s + def check_redirect(self, p, s): + redirect = p.get_redirect_url(s) + + if redirect is None: + raise Exception("Expected redirect") + + p, s = self.page_and_session() + s.unmarshal(redirect) + + p.process(s) + p.render(s) + class TestSession(object): def __init__(self, env): self.env = env @@ -216,17 +228,8 @@ p.process(s) - redirect = p.get_redirect_url(s) + self.env.check_redirect(p, s) - if redirect is None: - raise Exception("Expected redirect") - - p, s = self.env.page_and_session() - s.unmarshal(redirect) - - p.process(s) - p.render(s) - try: self.env.broker_registration = BrokerRegistration.selectBy \ (name=session.id)[0] @@ -258,16 +261,8 @@ p.process(s) - redirect = p.get_redirect_url(s) - - if redirect is None: - raise Exception("Expected redirect") + self.env.check_redirect(p, s) - s.unmarshal(redirect) - - p.process(s) - p.render(s) - try: reg = BrokerRegistration.selectBy(name=session.id)[0] raise Exception("Registration not deleted") @@ -289,18 +284,9 @@ form.submit(s) p.process(s) - - redirect = p.get_redirect_url(s) - if redirect is None: - raise Exception("Expected redirect") + self.env.check_redirect(p, s) - p, s = self.env.page_and_session() - s.unmarshal(redirect) - - p.process(s) - p.render(s) - try: self.env.broker_group = BrokerGroup.selectBy(name=session.id)[0] except IndexError: @@ -318,14 +304,8 @@ form.submit(s) p.process(s) - - redirect = p.get_redirect_url(s) - - if redirect is None: - raise Exception("Expected redirect") - p, s = self.env.page_and_session() - s.unmarshal(redirect) + self.env.check_redirect(p, s) class Remove(Test): def do_run(self, session): @@ -337,14 +317,8 @@ p.process(s) - redirect = p.get_redirect_url(s) + self.env.check_redirect(p, s) - if redirect is None: - raise Exception("Expected redirect") - - p, s = self.env.page_and_session() - s.unmarshal(redirect) - class BrokerTest(Test): def __init__(self, env, parent): super(BrokerTest, self).__init__(env, parent)

16 years, 8 months

1
0
0 / 0

rhmessaging commits: r2027 - in store/branches/java/M2.1.x/java/bdbstore: mvn-repo/sleepycat/berkeleydb-je and 1 other directories.

by rhmessaging-commits＠lists.jboss.org

Author: ritchiem Date: 2008-05-09 09:00:43 -0400 (Fri, 09 May 2008) New Revision: 2027 Added: store/branches/java/M2.1.x/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.2.76/ store/branches/java/M2.1.x/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.2.76/berkeleydb-je-3.2.76.jar store/branches/java/M2.1.x/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.2.76/berkeleydb-je-3.2.76.pom Modified: store/branches/java/M2.1.x/java/bdbstore/pom.xml Log: RHM-2 : Upgraded berkeleyDB to 3.2.76 Added: store/branches/java/M2.1.x/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.2.76/berkeleydb-je-3.2.76.jar =================================================================== (Binary files differ) Property changes on: store/branches/java/M2.1.x/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.2.76/berkeleydb-je-3.2.76.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: store/branches/java/M2.1.x/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.2.76/berkeleydb-je-3.2.76.pom =================================================================== --- store/branches/java/M2.1.x/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.2.76/berkeleydb-je-3.2.76.pom (rev 0) +++ store/branches/java/M2.1.x/java/bdbstore/mvn-repo/sleepycat/berkeleydb-je/3.2.76/berkeleydb-je-3.2.76.pom 2008-05-09 13:00:43 UTC (rev 2027) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?><project> + <modelVersion>4.0.0</modelVersion> + <groupId>sleepycat</groupId> + <artifactId>berkeleydb-je</artifactId> + <version>3.2.76</version> + <distributionManagement> + <status>deployed</status> + </distributionManagement> +</project> Modified: store/branches/java/M2.1.x/java/bdbstore/pom.xml =================================================================== --- store/branches/java/M2.1.x/java/bdbstore/pom.xml 2008-05-09 11:34:07 UTC (rev 2026) +++ store/branches/java/M2.1.x/java/bdbstore/pom.xml 2008-05-09 13:00:43 UTC (rev 2027) @@ -61,7 +61,7 @@ <dependency> <groupId>sleepycat</groupId> <artifactId>berkeleydb-je</artifactId> - <version>3.2.42</version> + <version>3.2.76</version> </dependency> <dependency> <groupId>log4j</groupId>

16 years, 8 months

1
0
0 / 0

rhmessaging commits: r2026 - in store/branches/java: M2.1.x/java/bdbstore and 1 other directory.

by rhmessaging-commits＠lists.jboss.org

Author: ritchiem Date: 2008-05-09 07:34:07 -0400 (Fri, 09 May 2008) New Revision: 2026 Added: store/branches/java/M2.1.x/ Modified: store/branches/java/M2.1.x/java/bdbstore/pom.xml Log: Created Fix branch for M2.1 based on M2.1 releases. Copied: store/branches/java/M2.1.x (from rev 2025, store/branches/java/M2.1-release) Modified: store/branches/java/M2.1.x/java/bdbstore/pom.xml =================================================================== --- store/branches/java/M2.1-release/java/bdbstore/pom.xml 2008-05-08 23:09:45 UTC (rev 2025) +++ store/branches/java/M2.1.x/java/bdbstore/pom.xml 2008-05-09 11:34:07 UTC (rev 2026) @@ -22,14 +22,14 @@ <groupId>org.etp.qpid</groupId> <artifactId>qpid-bdbstore</artifactId> <packaging>jar</packaging> - <version>1.0-incubating-M2.1-SNAPSHOT</version> + <version>1.0-incubating-M2.1.x-SNAPSHOT</version> <name>Qpid BDB Store</name> <url>http://cwiki.apache.org/confluence/display/qpid</url> <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid</artifactId> - <version>1.0-incubating-M2.1-SNAPSHOT</version> + <version>1.0-incubating-M2.1.x-SNAPSHOT</version> </parent>

16 years, 8 months

1
0
0 / 0

rhmessaging commits: r2025 - mgmt/cumin/python/cumin.

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2008-05-08 19:09:45 -0400 (Thu, 08 May 2008) New Revision: 2025 Modified: mgmt/cumin/python/cumin/broker.strings Log: Formatting fix for the broker browser Modified: mgmt/cumin/python/cumin/broker.strings =================================================================== --- mgmt/cumin/python/cumin/broker.strings 2008-05-08 23:04:28 UTC (rev 2024) +++ mgmt/cumin/python/cumin/broker.strings 2008-05-08 23:09:45 UTC (rev 2025) @@ -121,6 +121,10 @@ width: 100%; } +table.BrokerBrowser td { + vertical-align: top; +} + table.BrokerBrowser td.nav { width: 20%; vertical-align: top;

16 years, 8 months

1
0
0 / 0

rhmessaging commits: r2024 - mgmt/cumin/python/cumin.

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2008-05-08 19:04:28 -0400 (Thu, 08 May 2008) New Revision: 2024 Modified: mgmt/cumin/python/cumin/test.py Log: Extra spacing to make the report more readable Modified: mgmt/cumin/python/cumin/test.py =================================================================== --- mgmt/cumin/python/cumin/test.py 2008-05-08 22:55:40 UTC (rev 2023) +++ mgmt/cumin/python/cumin/test.py 2008-05-08 23:04:28 UTC (rev 2024) @@ -61,11 +61,14 @@ def report(self, out): out.write("Tests:") out.write(os.linesep) + out.write(os.linesep) self.stack[0].report(sys.stdout, 1) + out.write(os.linesep) out.write("Failures:") out.write(os.linesep) + out.write(os.linesep) if self.failed: for call in self.failed: @@ -79,12 +82,16 @@ out.write(os.linesep) out.write(" %s" % spec[3]) out.write(os.linesep) + + out.write(os.linesep) else: out.write(" None") out.write(os.linesep) + out.write(os.linesep) out.write("Summary:") out.write(os.linesep) + out.write(os.linesep) passed, failed = len(self.passed), len(self.failed) out.write(" %i passed, %i failed" % (passed, failed))

16 years, 8 months

1
0
0 / 0

rhmessaging commits: r2023 - mgmt/cumin/python/cumin.

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2008-05-08 18:55:40 -0400 (Thu, 08 May 2008) New Revision: 2023 Modified: mgmt/cumin/python/cumin/test.py Log: Use more descriptive exception messages. Remove printlns. Modified: mgmt/cumin/python/cumin/test.py =================================================================== --- mgmt/cumin/python/cumin/test.py 2008-05-08 22:43:41 UTC (rev 2022) +++ mgmt/cumin/python/cumin/test.py 2008-05-08 22:55:40 UTC (rev 2023) @@ -212,8 +212,6 @@ redirect = p.get_redirect_url(s) if redirect is None: - print form.name_errors.get(s), form.addr_errors.get(s) - raise Exception("Expected redirect") p, s = self.env.page_and_session() @@ -222,9 +220,12 @@ p.process(s) p.render(s) - self.env.broker_registration = BrokerRegistration.selectBy \ - (name=session.id)[0] - + try: + self.env.broker_registration = BrokerRegistration.selectBy \ + (name=session.id)[0] + except IndexError: + raise Exception("Registration not created") + self.run_children(session) class AddToGroup(Test): @@ -262,7 +263,7 @@ try: reg = BrokerRegistration.selectBy(name=session.id)[0] - raise Exception("Delete failed") + raise Exception("Registration not deleted") except IndexError: pass @@ -367,7 +368,11 @@ wait(predicate) - self.env.vhost = Vhost.selectBy(broker=self.env.broker, name="/")[0] + try: + self.env.vhost = Vhost.selectBy \ + (broker=self.env.broker, name="/")[0] + except IndexError: + raise Exception("Vhost not found") self.run_children(session) @@ -382,10 +387,11 @@ wait(predicate) - self.env.queue = Queue.selectBy(vhost=vhost, name=name)[0] + try: + self.env.queue = Queue.selectBy(vhost=vhost, name=name)[0] + except IndexError: + raise Exception("Queue not found") - print self.env.queue - self.run_children(session) class ExchangeTest(Test): @@ -393,10 +399,11 @@ vhost = self.env.vhost name = self.env.broker_exchange.name - self.env.exchange = Exchange.selectBy(vhost=vhost, name=name)[0] + try: + self.env.exchange = Exchange.selectBy(vhost=vhost, name=name)[0] + except IndexError: + raise Exception("Exchange not found") - print self.env.exchange - self.run_children(session) class ClientTest(Test): @@ -407,10 +414,11 @@ address = self.env.broker_conn.host + ":" + \ str(self.env.broker_conn.port) - self.env.client = Client.selectBy(vhost=vhost, address=address)[0] + try: + self.env.client = Client.selectBy(vhost=vhost, address=address)[0] + except IndexError: + raise Exception("Client not found") - print self.env.client - self.run_children(session) def wait(predicate, timeout=30):

16 years, 8 months

1
0
0 / 0

rhmessaging commits: r2022 - mgmt/cumin/python/cumin.

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2008-05-08 18:43:41 -0400 (Thu, 08 May 2008) New Revision: 2022 Modified: mgmt/cumin/python/cumin/test.py Log: Shorten the id used for test-created objects Modified: mgmt/cumin/python/cumin/test.py =================================================================== --- mgmt/cumin/python/cumin/test.py 2008-05-08 22:37:14 UTC (rev 2021) +++ mgmt/cumin/python/cumin/test.py 2008-05-08 22:43:41 UTC (rev 2022) @@ -52,7 +52,7 @@ class TestSession(object): def __init__(self, env): self.env = env - self.id = datetime.now().strftime("test-%Y-%m-%d-%H-%M-%S") + self.id = datetime.now().strftime("test-%H-%M-%S") self.stack = list() self.passed = list()

16 years, 8 months

1
0
0 / 0

rhmessaging commits: r2021 - mgmt/cumin/python/cumin.

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2008-05-08 18:37:14 -0400 (Thu, 08 May 2008) New Revision: 2021 Modified: mgmt/cumin/python/cumin/test.py Log: Add a BrokerRegistration remove test Modified: mgmt/cumin/python/cumin/test.py =================================================================== --- mgmt/cumin/python/cumin/test.py 2008-05-08 22:32:13 UTC (rev 2020) +++ mgmt/cumin/python/cumin/test.py 2008-05-08 22:37:14 UTC (rev 2021) @@ -229,7 +229,7 @@ class AddToGroup(Test): def do_run(self, session): - group = BrokerGroup(name="test-group") + group = BrokerGroup(name=session.id) group.sync() p, s = self.env.page_and_session() @@ -238,8 +238,34 @@ class Remove(Test): def do_run(self, session): - raise Exception("Not implemented") + try: + reg = BrokerRegistration.selectBy(name=session.id)[0] + except IndexError: + raise Exception("Broker missing") + p, s = self.env.page_and_session() + + form = p.show_main(s).show_broker(s, reg).show_remove(s) + form.submit(s) + + p.process(s) + + redirect = p.get_redirect_url(s) + + if redirect is None: + raise Exception("Expected redirect") + + s.unmarshal(redirect) + + p.process(s) + p.render(s) + + try: + reg = BrokerRegistration.selectBy(name=session.id)[0] + raise Exception("Delete failed") + except IndexError: + pass + class BrokerGroupTest(Test): def __init__(self, env, parent): super(BrokerGroupTest, self).__init__(env, parent)

16 years, 8 months

1
0
0 / 0

rhmessaging commits: r2020 - mgmt/mint.

by rhmessaging-commits＠lists.jboss.org

Author: nunofsantos Date: 2008-05-08 18:32:13 -0400 (Thu, 08 May 2008) New Revision: 2020 Modified: mgmt/mint/Makefile Log: generate python from store xml schema, if STORE_SCHEMA_XML is defined; skip otherwise Modified: mgmt/mint/Makefile =================================================================== --- mgmt/mint/Makefile 2008-05-08 22:09:09 UTC (rev 2019) +++ mgmt/mint/Makefile 2008-05-08 22:32:13 UTC (rev 2020) @@ -28,6 +28,7 @@ schema-python: @if [ -z "$$MINT_SCHEMA_XML" ]; then echo "MINT_SCHEMA_XML is not set"; exit 1; fi python python/mint/schemaparser.py ${MINT_SCHEMA_XML} python/mint/schema.py ${dsn} + @if [ -z "$$STORE_SCHEMA_XML" ]; then echo "Warning: STORE_SCHEMA_XML is not set, skipping store schema generation"; else python python/mint/schemaparser.py ${STORE_SCHEMA_XML} python/mint/schema-store.py ${dsn}; cat python/mint/schema-store.py >> python/mint/schema.py; fi schema-sql: sqlobject-admin sql -m mint -m mint.schema -c ${dsn} | sed -e '1,2d' > sql/schema.sql

16 years, 8 months

1
0
0 / 0

rhmessaging commits: r2019 - mgmt/mint/python/mint.

by rhmessaging-commits＠lists.jboss.org

Author: nunofsantos Date: 2008-05-08 18:09:09 -0400 (Thu, 08 May 2008) New Revision: 2019 Modified: mgmt/mint/python/mint/__init__.py Log: handle KeyError to allow cumin to receive further updates from broker Modified: mgmt/mint/python/mint/__init__.py =================================================================== --- mgmt/mint/python/mint/__init__.py 2008-05-08 21:49:39 UTC (rev 2018) +++ mgmt/mint/python/mint/__init__.py 2008-05-08 22:09:09 UTC (rev 2019) @@ -367,19 +367,22 @@ d["recTime"] = datetime.fromtimestamp(timestamps[0]/1000000000) d["creationTime"] = datetime.fromtimestamp(timestamps[1]/1000000000) self.log(d) - for parentKey in self.findParentKeys(d): - convertedKey = self.convertRefKey(parentKey) - cls = schema.schemaNameToClassMap.get(convertedKey) - if cls: - d[convertedKey] = conn.getByOriginalId(cls, d.pop(parentKey)) - obj = conn.getByOriginalId(schema.schemaNameToClassMap[objectName], d["idOriginal"], create=True) - try: + for parentKey in self.findParentKeys(d): + convertedKey = self.convertRefKey(parentKey) + cls = schema.schemaNameToClassMap.get(convertedKey) + if cls: + d[convertedKey] = conn.getByOriginalId(cls, d.pop(parentKey)) + obj = conn.getByOriginalId(schema.schemaNameToClassMap[objectName], d["idOriginal"], create=True) obj.set(**d) + obj.syncUpdate() except TypeError, detail: self.log("Schema mismatch: %s" % detail) + return + except KeyError, detail: + self.log("Schema mismatch: %s" % detail) + return - obj.syncUpdate() self.log("END CONFIG---------------------------------------------------\n") return obj

16 years, 8 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

rhmessaging-commits May 2008