Changeset e58a09 in indico

Timestamp:

04/13/12 10:13:40 (13 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 4c7d4152dff271ba5df5a8606605969cab454080

Children:

e3e124

Parents:

09fd0c

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (04/12/12 12:02:08)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (04/13/12 10:13:40)

Message:

[FIX] Several fixes for Chrome

Location:

indico/tests/python/functional

Files:

• lecture_test.py (modified) (3 diffs)
• meeting_test.py (modified) (4 diffs)
• seleniumTestCase.py (modified) (5 diffs)

indico/tests/python/functional/lecture_test.py

@@ -42 +42 @@
         ed.send_keys("12/07/2011 18:00")
         self.click(css="button")
+        self.wait_for_jquery()
+
 
     def test_tools(self):
@@ -133 +135 @@
         self.click(id="_GID1_existingAv0")
         self.click(xpath="//button[@type='button']")
+
+        # wait for overlay to go away
+        self.wait_remove(css='.ui-widget-overlay')
+
         self.click(ltext="Add")
         self.click(id="add_new_user")
@@ -146 +152 @@
         self.click(id="checkParticipant1")
         self.click(id="send_email")
-        self.click(css="input[type=\"text\"]")
         self.type(css="input[type=\"text\"]", text="test")
         self.click(css="button.ui-button")
+
+        @self.retry()
+        def _retry():
+            title = self.wait(css='.ui-dialog-title')
+            self.assertTrue('E-mail sent' in title.text)
+
+        _retry()
+
         self.click(css="button.ui-button")
         self.click(id="checkParticipant1")

indico/tests/python/functional/meeting_test.py

@@ -33 +33 @@
         self.type(id="sessionTitle", text="Session 1")
         self.click(css="button.ui-button")
+
+        # wait for overlay to go away
+        self.wait_remove(css='.ui-widget-overlay')
+        self.wait_for_jquery()
+
         self.click(ltext="Add new")
         self.click(ltext="Contribution")
@@ -40 +45 @@
         # wait for overlay to go away
         self.wait_remove(css='.ui-widget-overlay')
+        self.wait_for_jquery()
 
         self.click(ltext="Add new")
@@ -45 +51 @@
         self.type(id="breakTitle", text="coffe break")
         self.click(css="button.ui-button")
-        self.click(css="ul.ui-tabs-nav li:nth-child(2)")
+
+        self.wait_remove(css='.ui-widget-overlay')
+        self.wait_for_jquery()
+
+        self.click(css='.ui-tabs-nav li:nth-child(2)')
+
         self.click(ltext="Add new")
         self.click(ltext="Session")
@@ -52 +63 @@
         self.click(css="button.ui-button")
 
-        # wait for overlay to go away
         self.wait_remove(css='.ui-widget-overlay')
+        self.wait_for_jquery()
 
         self.click(ltext="Reschedule")

indico/tests/python/functional/seleniumTestCase.py

@@ -23 +23 @@
 """
 
+from functools import wraps
+
 # Test libs
 from selenium import webdriver
+from selenium.common.exceptions import NoSuchElementException, StaleElementReferenceException
 from selenium.webdriver.common.alert import Alert
 from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
@@ -105 +108 @@
 
     @classmethod
-    def waitForAjax(cls, sel, timeout=5000):
-        """
-        Wait that all the AJAX calls finish
-        """
-        time.sleep(1)
-        sel.wait_for_condition("selenium.browserbot.getCurrentWindow()"
-                               ".activeWebRequests == 0", timeout)
-
-    @classmethod
-    def waitForElement(cls, sel, elem, timeout=5000):
-        """
-        Wait for a given element to show up
-        """
-        sel.wait_for_condition("selenium.isElementPresent(\"%s\")" % elem, timeout)
-
-    @classmethod
-    def waitPageLoad(cls, sel, timeout=30000):
-        """
-        Wait for a page to load (give it some time to load the JS too)
-        """
-        sel.wait_for_page_to_load(timeout)
-        time.sleep(2)
-
-    @classmethod
     def go(cls, rel_url):
         webd.get("%s%s" % (Config.getInstance().getBaseURL(), rel_url))
@@ -145 +124 @@
                 unittest.TestCase.failUnless(cls, func(*args))
             except AssertionError, e:
-                print "left %d" % triesLeft
                 exception = e
                 triesLeft -= 1
@@ -174 +152 @@
 
     @classmethod
+    def execute(cls, code):
+        return webd.execute_script(code)
+
+    @classmethod
+    def jquery(cls, selector):
+        return cls.execute("var elem = $('%s'); return elem?elem[0]:null;" % selector)
+
+    @classmethod
+    def wait_for_jquery(cls, timeout=5):
+        while timeout:
+            active = webd.execute_script('return jQuery.active')
+            if active == 0:
+                return
+            time.sleep(1)
+            timeout -= 1
+        raise Exception('timeout')
+
+    @classmethod
     @name_or_id_target
     def select(cls, elem, label=''):
@@ -179 +175 @@
 
     @classmethod
-    @name_or_id_target
-    def wait_remove(cls, timeout=5, **kwargs):
+    def wait(cls, timeout=5, **kwargs):
+        """
+        Wait for a given element to show up
+        """
         while timeout:
-            elem = elem_get(**kwargs)
-            if not elem:
-                break
+            try:
+                return elem_get(**kwargs)
+            except NoSuchElementException:
+                pass
             time.sleep(1)
             timeout -= 1
+        raise Exception('timeout')
+
+    @classmethod
+    def retry(cls, max_retries=2):
+        def _retry(f):
+            @wraps(f)
+            def _wrapper():
+                i = 0
+                for i in range(0, max_retries):
+                    try:
+                        return f()
+                    except:
+                        time.sleep(1)
+                raise Exception("'max_retries' exceeded")
+            return _wrapper
+        return _retry
+
+    @classmethod
+    def wait_remove(cls, css, timeout=5):
+        ts = time.time()
+        while True:
+            if not cls.jquery(css):
+                return
+
+            time.sleep(1)
+
+            if time.time() - ts > timeout:
+                break
+
+        raise Exception('timeout')
 
 class LoggedInSeleniumTestCase(SeleniumTestCase):