Make tests more robust across chrome versions

runestonetest · runestonetest · commit 76f0990cdaf4 · 2019-09-17T13:55:35.000Z
diff --git a/runestone/activecode/test/test_activecode.py b/runestone/activecode/test/test_activecode.py
@@ -16,6 +16,14 @@ def test_hello(self):
         :return:
         '''
         self.driver.get(self.host + "/index.html")
+        wait = WebDriverWait(self.driver, 10)
+        try:
+            wait.until(
+                EC.presence_of_element_located((By.ID, "test1"))
+            )
+        except:
+            text = self.driver.page_source
+            print(text)
         t1 = self.driver.find_element_by_id("test1")
         self.assertIsNotNone(t1)
         rb = t1.find_element_by_class_name("run-button")
diff --git a/runestone/assess/test/test_assess.py b/runestone/assess/test/test_assess.py
@@ -5,6 +5,9 @@
 __author__ = 'yasinovskyy'
 
 from unittest import TestCase
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.common.by import By
 from runestone.unittest_base import module_fixture_maker, RunestoneTestCase
 
 mf, setUpModule, tearDownModule = module_fixture_maker(__file__, True)
@@ -45,6 +48,14 @@ class MultipleChoiceQuestion_Tests(RunestoneTestCase):
     def test_ma1(self):
         '''Multiple Answer: Nothing selected, Check button clicked'''
         self.driver.get(self.host + "/index.html")
+        wait = WebDriverWait(self.driver, 10)
+        try:
+            wait.until(
+                EC.presence_of_element_located((By.ID, "question1"))
+            )
+        except:
+            text = self.driver.page_source
+            print(text)
         t1 = self.driver.find_element_by_id("question1")
 
         btn_check = t1.find_element_by_tag_name('button')
diff --git a/runestone/clickableArea/test/test_clickableArea.py b/runestone/clickableArea/test/test_clickableArea.py
@@ -4,6 +4,9 @@
 
 __author__ = 'yasinovskyy'
 
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.common.by import By
 from runestone.unittest_base import module_fixture_maker, RunestoneTestCase
 
 setUpModule, tearDownModule = module_fixture_maker(__file__)
@@ -15,6 +18,15 @@ class ClickableAreaQuestion_Tests(RunestoneTestCase):
     def test_ca1(self):
         '''Text/Code: Nothing selected'''
         self.driver.get(self.host + "/index.html")
+        wait = WebDriverWait(self.driver, 10)
+        try:
+            wait.until(
+                EC.presence_of_element_located((By.TAG_NAME, "body"))
+            )
+        except:
+            text = self.driver.page_source
+            print(text)
+
         t1 = self.driver.find_elements_by_class_name("alert-warning")[0]
 
         btn_check = t1.find_element_by_class_name('btn-success')
diff --git a/runestone/dragndrop/test/test_dragndrop.py b/runestone/dragndrop/test/test_dragndrop.py
@@ -10,6 +10,9 @@
 
 __author__ = 'yasinovskyy'
 
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.common.by import By
 from runestone.unittest_base import module_fixture_maker, RunestoneTestCase
 
 setUpModule, tearDownModule = module_fixture_maker(__file__)
@@ -28,6 +31,15 @@ def setUp(self):
     def test_dnd1(self):
         '''No selection. Button clicked'''
         self.driver.get(self.host + "/index.html")
+        wait = WebDriverWait(self.driver, 10)
+        try:
+            wait.until(
+                EC.presence_of_element_located((By.ID, "drag-and-drop"))
+            )
+        except:
+            text = self.driver.page_source
+            print(text)
+
         t1 = self.driver.find_element_by_id("drag-and-drop")
 
         btn_check = t1.find_element_by_class_name('btn-success')
diff --git a/runestone/fitb/test/test_fitb.py b/runestone/fitb/test/test_fitb.py
@@ -1,6 +1,9 @@
 from unittest import TestCase
 import codecs
 from selenium.webdriver.common.alert import Alert
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.common.by import By
 from runestone.unittest_base import module_fixture_maker, RunestoneTestCase
 
 mf, setUpModule, tearDownModule = module_fixture_maker(__file__, True)
@@ -46,6 +49,15 @@ class FITBtests(RunestoneTestCase):
     # Load the web page, then return the DIV containing a FITB question.
     def find_fitb(self, elem_id):
         self.driver.get(self.host + "/index.html")
+        wait = WebDriverWait(self.driver, 10)
+        try:
+            wait.until(
+                EC.presence_of_element_located((By.ID, elem_id))
+            )
+        except:
+            text = self.driver.page_source
+            print(text)
+
         self.fitb = self.driver.find_element_by_id(elem_id)
         return self.fitb
 
diff --git a/runestone/lp/test/test_lp.py b/runestone/lp/test/test_lp.py
@@ -20,6 +20,8 @@
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.common.by import By
+
 #
 # Local imports
 # -------------
@@ -163,6 +165,15 @@ def test_5(self):
 class Functional_Test_Lp(RunestoneTestCase):
     def test_1(self):
         self.driver.get(self.host + "/lp_tester.s.html")
+        wait = WebDriverWait(self.driver, 10)
+        try:
+            wait.until(
+                EC.presence_of_element_located((By.TAG_NAME, "body"))
+            )
+        except:
+            text = self.driver.page_source
+            print(text)
+
         snippets = self.driver.find_elements_by_class_name("code_snippet")
         self.assertEqual(len(snippets), 2)
         check_button = self.driver.find_element_by_id('e1')
diff --git a/runestone/matrixeq/test/test_matrixeq.py b/runestone/matrixeq/test/test_matrixeq.py
@@ -3,6 +3,9 @@
 """
 
 from unittest import TestCase
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.common.by import By
 from runestone.unittest_base import module_fixture_maker, RunestoneTestCase
 
 __author__ = 'wayne brown'
@@ -15,6 +18,15 @@ class Matrixeq_Tests(RunestoneTestCase):
     def test_ma1(self):
         ''' matrixeq - test the click of a mutliplication operator '''
         self.driver.get(self.host + "/index.html")
+        wait = WebDriverWait(self.driver, 10)
+        try:
+            wait.until(
+                EC.presence_of_element_located((By.TAG_NAME, "body"))
+            )
+        except:
+            text = self.driver.page_source
+            print(text)
+
         # t1 = self.driver.find_element_by_id("question1")
         #
         # btn_check = t1.find_element_by_tag_name('button')
diff --git a/runestone/parsons/test/test_parsons.py b/runestone/parsons/test/test_parsons.py
@@ -21,6 +21,14 @@ class ParsonsTests(RunestoneTestCase):
     def test_general(self):
 
         self.driver.get(self.host + "/index.html")
+        wait = WebDriverWait(self.driver, 10)
+        try:
+            wait.until(
+                EC.presence_of_element_located((By.ID, "parsons-1-source"))
+            )
+        except:
+            text = self.driver.page_source
+            print(text)
         self.driver.execute_script('window.localStorage.clear();')
 
         # Source has correct number of blocks and each block has a label
diff --git a/runestone/poll/test/test_poll.py b/runestone/poll/test/test_poll.py
@@ -1,11 +1,24 @@
 from runestone.unittest_base import module_fixture_maker, RunestoneTestCase
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.common.by import By
+
 
 setUpModule, tearDownModule = module_fixture_maker(__file__)
 
 class PollTests(RunestoneTestCase):
     def test_poll(self):
         ''' test the poll directive '''
         self.driver.get(self.host + '/index.html')
+        wait = WebDriverWait(self.driver, 10)
+        try:
+            wait.until(
+                EC.presence_of_element_located((By.ID, "pollid1_container"))
+            )
+        except:
+            text = self.driver.page_source
+            print(text)
+
 
         poll_div = self.driver.find_element_by_id('pollid1_container')
 
@@ -20,6 +33,6 @@ def test_poll(self):
         el = poll_div.find_element_by_id('pollid1_sent') # check for results span
         self.assertIsNotNone(el)
         self.assertEqual(el.text[:6], "Thanks")
-        
+
         # just make sure we can find the results div - an exception will be raised if the div cannot be found
         poll_div.find_element_by_id('pollid1_results')
diff --git a/runestone/reveal/test/test_reveal.py b/runestone/reveal/test/test_reveal.py
@@ -5,13 +5,25 @@
 __author__ = 'yasinovskyy'
 
 from runestone.unittest_base import module_fixture_maker, RunestoneTestCase
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.common.by import By
 
 setUpModule, tearDownModule = module_fixture_maker(__file__)
 
 class RevealQuestion_Tests(RunestoneTestCase):
     def test_r1(self):
         '''Initial view. Content is hidden'''
         self.driver.get(self.host + "/index.html")
+        wait = WebDriverWait(self.driver, 10)
+        try:
+            wait.until(
+                EC.presence_of_element_located((By.ID, "reveal"))
+            )
+        except:
+            text = self.driver.page_source
+            print(text)
+
         t1 = self.driver.find_element_by_id("reveal")
 
         q1 = t1.find_element_by_id('question1')
diff --git a/runestone/showeval/test/test_showEval.py b/runestone/showeval/test/test_showEval.py
@@ -1,5 +1,8 @@
 import time
 from runestone.unittest_base import module_fixture_maker, RunestoneTestCase
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.common.by import By
 
 __author__ = 'wayne brown'
 
@@ -12,6 +15,16 @@ def setUp(self):
         super(ShowEvalTest_TraceMode, self).setUp()
         print(vars(self))
         self.driver.get(self.host + "/trace.html")
+        wait = WebDriverWait(self.driver, 10)
+        try:
+            wait.until(
+                EC.presence_of_element_located((By.TAG_NAME, "body"))
+            )
+        except:
+            text = self.driver.page_source
+            print(text)
+
+
 
     def test_Next_Step(self):
         driver = self.driver
diff --git a/runestone/spreadsheet/test/test_spreadsheet.py b/runestone/spreadsheet/test/test_spreadsheet.py
@@ -12,6 +12,15 @@ class SpreadsheetTests(RunestoneTestCase):
 
     def test_ss_autograde(self):
         self.driver.get(self.host + "/index.html")
+        wait = WebDriverWait(self.driver, 10)
+        try:
+            wait.until(
+                EC.presence_of_element_located((By.ID, "ss1"))
+            )
+        except:
+            text = self.driver.page_source
+            print(text)
+
         t2 = self.driver.find_element_by_id("ss1")
         self.assertIsNotNone(t2)
         time.sleep(1)
diff --git a/runestone/tabbedStuff/test/test_tabbedStuff.py b/runestone/tabbedStuff/test/test_tabbedStuff.py
@@ -5,13 +5,26 @@
 __author__ = 'yasinovskyy'
 
 from runestone.unittest_base import module_fixture_maker, RunestoneTestCase
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.common.by import By
 
 setUpModule, tearDownModule = module_fixture_maker(__file__)
 
 class TabbedQuestion_Tests(RunestoneTestCase):
     def test_t1(self):
         '''Initial view. Tab 1 is visible, tab 2 is hidden'''
         self.driver.get(self.host + "/index.html")
+        wait = WebDriverWait(self.driver, 10)
+        try:
+            wait.until(
+                EC.presence_of_element_located((By.ID, "exercise1"))
+            )
+        except:
+            text = self.driver.page_source
+            print(text)
+
+
         e1 = self.driver.find_element_by_id("exercise1")
 
         t1 = e1.find_element_by_class_name('active')
diff --git a/runestone/unittest_base.py b/runestone/unittest_base.py
@@ -2,6 +2,8 @@
 import os
 import sys
 import platform
+import signal
+import time
 import subprocess
 from selenium import webdriver
 from selenium.webdriver.chrome.options import Options
@@ -40,6 +42,18 @@ def setUpModule(self):
         print(self.build_stdout_data + self.build_stderr_data)
         if self.exit_status_success:
             self.assertFalse(p.returncode)
+        # Make sure any older servers on port 8081 are killed  -- Windows???
+        process = subprocess.Popen(["lsof", "-i", ":{0}".format(PORT)], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        stdout, stderr = process.communicate()
+        for process in str(stdout.decode("utf-8")).split("\n")[1:]:
+            data = [x for x in process.split(" ") if x != '']
+            if (len(data) <= 1):
+                continue
+            ptokill = int(data[1])
+            os.kill(ptokill, signal.SIGKILL)
+            time.sleep(1)
+            os.kill(ptokill, 0)  # will return an OSError if not dead
+
         # Run the server. Simply calling ``runestone serve`` fails, since the process killed isn't the actual server, but probably a setuptools-created launcher.
         self.runestone_server = subprocess.Popen([sys.executable, '-m', 'runestone', 'serve', '--port', PORT])
 
@@ -54,6 +68,7 @@ def setUpModule(self):
         #self.driver = webdriver.PhantomJS() # use this for Jenkins auto testing
         options = Options()
         options.add_argument("--window-size=1200,800")
+        options.add_argument("--no-sandbox")
         self.driver = webdriver.Chrome(chrome_options=options)  # good for development.
 
         # Make this accessible
