Merge https://github.com/zsloan/genenetwork

Resolved conflicts:
	wqflask/base/trait.py
	wqflask/wqflask/correlation/correlationFunction.py
	wqflask/wqflask/correlation/correlation_function.py
	wqflask/wqflask/correlation/correlation_functions.py
	wqflask/wqflask/correlation/show_corr_results.py

1 files changed, 28 insertions, 0 deletions

diff --git a/webtests/test_runner.py b/webtests/test_runner.py
new file mode 100644
index 00000000..ef6d0d69
--- /dev/null
+++ b/webtests/test_runner.py
@@ -0,0 +1,28 @@
+from __future__ import absolute_import, division, print_function
+
+import unittest
+import doctest
+import glob
+
+tests = ("correlation_test",
+         "correlation_matrix_test",
+         "marker_regression_test",
+         "show_trait_js_test")
+
+
+def main():
+    tests = glob.glob("*_test.py")
+    
+    suite = unittest.TestSuite()
+    
+    for testname in tests:
+        test = testname.rsplit(".", 1)[0]
+        print("Test is:", test)
+        mod = __import__(test)
+        suite.addTest(doctest.DocTestSuite(mod))
+        
+    runner = unittest.TextTestRunner()
+    runner.run(suite)
+    
+if __name__ == '__main__':
+    main()
\ No newline at end of file