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

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2008-05-08 17:49:39 -0400 (Thu, 08 May 2008)
New Revision: 2018

Modified:
   mgmt/cumin/python/cumin/test.py
Log:
Improve the logic that checks for expected redirects

Modified: mgmt/cumin/python/cumin/test.py
===================================================================
--- mgmt/cumin/python/cumin/test.py	2008-05-08 21:26:46 UTC (rev 2017)
+++ mgmt/cumin/python/cumin/test.py	2008-05-08 21:49:39 UTC (rev 2018)
@@ -211,12 +211,14 @@
 
         redirect = p.get_redirect_url(s)
 
-        if redirect:
-            p, s = self.env.page_and_session()
-            s.unmarshal(redirect)
-        else:
+        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()
+        s.unmarshal(redirect)
+
         p.process(s)
         p.render(s)
 
@@ -256,12 +258,12 @@
         
         redirect = p.get_redirect_url(s)
 
-        if redirect:
-            p, s = self.env.page_and_session()
-            s.unmarshal(redirect)
-        else:
+        if redirect is None:
             raise Exception("Expected redirect")
 
+        p, s = self.env.page_and_session()
+        s.unmarshal(redirect)
+
         p.process(s)
         p.render(s)
 
@@ -285,12 +287,12 @@
             
             redirect = p.get_redirect_url(s)
             
-            if redirect:
-                p, s = self.env.page_and_session()
-                s.unmarshal(redirect)
-            else:
+            if redirect is None:
                 raise Exception("Expected redirect")
 
+            p, s = self.env.page_and_session()
+            s.unmarshal(redirect)
+
     class Remove(Test):
         def do_run(self, session):
             p, s = self.env.page_and_session()
@@ -303,12 +305,12 @@
 
             redirect = p.get_redirect_url(s)
 
-            if redirect:
-                p, s = self.env.page_and_session()
-                s.unmarshal(redirect)
-            else:
+            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)