Don't overwhelm output with whole page.

runestonetest · runestonetest · commit 6806d8535b2c · 2019-09-17T21:18:55.000Z
diff --git a/runestone/activecode/test/test_activecode.py b/runestone/activecode/test/test_activecode.py
@@ -23,7 +23,7 @@ def test_hello(self):
             )
         except:
             text = self.driver.page_source
-            print(text)
+            print(text[:300])
         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
@@ -55,7 +55,7 @@ def test_ma1(self):
             )
         except:
             text = self.driver.page_source
-            print(text)
+            print(text[:300])
         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
@@ -25,7 +25,7 @@ def test_ca1(self):
             )
         except:
             text = self.driver.page_source
-            print(text)
+            print(text[:300])
 
         t1 = self.driver.find_elements_by_class_name("alert-warning")[0]
 
diff --git a/runestone/dragndrop/test/test_dragndrop.py b/runestone/dragndrop/test/test_dragndrop.py
@@ -38,7 +38,7 @@ def test_dnd1(self):
             )
         except:
             text = self.driver.page_source
-            print(text)
+            print(text[:300])
 
         t1 = self.driver.find_element_by_id("drag-and-drop")
 
diff --git a/runestone/fitb/test/test_fitb.py b/runestone/fitb/test/test_fitb.py
@@ -56,7 +56,7 @@ def find_fitb(self, elem_id):
             )
         except:
             text = self.driver.page_source
-            print(text)
+            print(text[:300])
 
         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
@@ -172,7 +172,7 @@ def test_1(self):
             )
         except:
             text = self.driver.page_source
-            print(text)
+            print(text[:300])
 
         snippets = self.driver.find_elements_by_class_name("code_snippet")
         self.assertEqual(len(snippets), 2)
diff --git a/runestone/matrixeq/test/test_matrixeq.py b/runestone/matrixeq/test/test_matrixeq.py
@@ -25,7 +25,7 @@ def test_ma1(self):
             )
         except:
             text = self.driver.page_source
-            print(text)
+            print(text[:300])
 
         # t1 = self.driver.find_element_by_id("question1")
         #
diff --git a/runestone/parsons/test/test_parsons.py b/runestone/parsons/test/test_parsons.py
@@ -13,7 +13,7 @@
 from selenium.common.exceptions import TimeoutException
 from selenium.common.exceptions import NoSuchElementException
 
-mf, setUpModule, tearDownModule = module_fixture_maker(__file__, True)
+setUpModule, tearDownModule = module_fixture_maker(__file__)
 
 
 class ParsonsTests(RunestoneTestCase):
@@ -28,7 +28,7 @@ def test_general(self):
             )
         except:
             text = self.driver.page_source
-            print(text)
+            print(text[:300])
         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
@@ -17,7 +17,7 @@ def test_poll(self):
             )
         except:
             text = self.driver.page_source
-            print(text)
+            print(text[:300])
 
 
         poll_div = self.driver.find_element_by_id('pollid1_container')
diff --git a/runestone/reveal/test/test_reveal.py b/runestone/reveal/test/test_reveal.py
@@ -22,7 +22,7 @@ def test_r1(self):
             )
         except:
             text = self.driver.page_source
-            print(text)
+            print(text[:300])
 
         t1 = self.driver.find_element_by_id("reveal")
 
diff --git a/runestone/showeval/test/test_showEval.py b/runestone/showeval/test/test_showEval.py
@@ -22,7 +22,7 @@ def setUp(self):
             )
         except:
             text = self.driver.page_source
-            print(text)
+            print(text[:300])
 
 
 
diff --git a/runestone/spreadsheet/test/test_spreadsheet.py b/runestone/spreadsheet/test/test_spreadsheet.py
@@ -19,7 +19,7 @@ def test_ss_autograde(self):
             )
         except:
             text = self.driver.page_source
-            print(text)
+            print(text[:300])
 
         t2 = self.driver.find_element_by_id("ss1")
         self.assertIsNotNone(t2)
diff --git a/runestone/tabbedStuff/test/test_tabbedStuff.py b/runestone/tabbedStuff/test/test_tabbedStuff.py
@@ -22,7 +22,7 @@ def test_t1(self):
             )
         except:
             text = self.driver.page_source
-            print(text)
+            print(text[:300])
 
 
         e1 = self.driver.find_element_by_id("exercise1")
diff --git a/runestone/unittest_base.py b/runestone/unittest_base.py
@@ -2,6 +2,7 @@
 import os
 import sys
 import platform
+import pytest
 import signal
 import time
 import subprocess
@@ -43,16 +44,27 @@ def setUpModule(self):
         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
+        if sys.platform in ("darwin", "linux"):
+            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(2)
+                try:
+                    os.kill(ptokill, 0)  # will throw an Error if process gone
+                    pytest.exit("Stale runestone server can't kill process: {}".format(ptokill))
+                except ProcessLookupError:
+                    # The process was killed
+                    pass
+                except PermissionError:
+                    pytest.exit("Another server is using port {} process: {}".format(PORT, ptokill))
+                except Exception:
+                    pytest.exit("Unknown error while trying to kill stale runestone server")
+
 
         # 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])

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ def test_hello(self):`
`23`	`23`	`)`
`24`	`24`	`except:`
`25`	`25`	`text = self.driver.page_source`
`26`		`- print(text)`
	`26`	`+ print(text[:300])`
`27`	`27`	`t1 = self.driver.find_element_by_id("test1")`
`28`	`28`	`self.assertIsNotNone(t1)`
`29`	`29`	`rb = t1.find_element_by_class_name("run-button")`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ def test_ma1(self):`
`55`	`55`	`)`
`56`	`56`	`except:`
`57`	`57`	`text = self.driver.page_source`
`58`		`- print(text)`
	`58`	`+ print(text[:300])`
`59`	`59`	`t1 = self.driver.find_element_by_id("question1")`
`60`	`60`
`61`	`61`	`btn_check = t1.find_element_by_tag_name('button')`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ def test_ca1(self):`
`25`	`25`	`)`
`26`	`26`	`except:`
`27`	`27`	`text = self.driver.page_source`
`28`		`- print(text)`
	`28`	`+ print(text[:300])`
`29`	`29`
`30`	`30`	`t1 = self.driver.find_elements_by_class_name("alert-warning")[0]`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ def test_dnd1(self):`
`38`	`38`	`)`
`39`	`39`	`except:`
`40`	`40`	`text = self.driver.page_source`
`41`		`- print(text)`
	`41`	`+ print(text[:300])`
`42`	`42`
`43`	`43`	`t1 = self.driver.find_element_by_id("drag-and-drop")`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ def find_fitb(self, elem_id):`
`56`	`56`	`)`
`57`	`57`	`except:`
`58`	`58`	`text = self.driver.page_source`
`59`		`- print(text)`
	`59`	`+ print(text[:300])`
`60`	`60`
`61`	`61`	`self.fitb = self.driver.find_element_by_id(elem_id)`
`62`	`62`	`return self.fitb`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ def test_1(self):`
`172`	`172`	`)`
`173`	`173`	`except:`
`174`	`174`	`text = self.driver.page_source`
`175`		`- print(text)`
	`175`	`+ print(text[:300])`
`176`	`176`
`177`	`177`	`snippets = self.driver.find_elements_by_class_name("code_snippet")`
`178`	`178`	`self.assertEqual(len(snippets), 2)`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ def test_ma1(self):`
`25`	`25`	`)`
`26`	`26`	`except:`
`27`	`27`	`text = self.driver.page_source`
`28`		`- print(text)`
	`28`	`+ print(text[:300])`
`29`	`29`
`30`	`30`	`# t1 = self.driver.find_element_by_id("question1")`
`31`	`31`	`#`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ def test_poll(self):`
`17`	`17`	`)`
`18`	`18`	`except:`
`19`	`19`	`text = self.driver.page_source`
`20`		`- print(text)`
	`20`	`+ print(text[:300])`
`21`	`21`
`22`	`22`
`23`	`23`	`poll_div = self.driver.find_element_by_id('pollid1_container')`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ def test_r1(self):`
`22`	`22`	`)`
`23`	`23`	`except:`
`24`	`24`	`text = self.driver.page_source`
`25`		`- print(text)`
	`25`	`+ print(text[:300])`
`26`	`26`
`27`	`27`	`t1 = self.driver.find_element_by_id("reveal")`
`28`	`28`