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

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)