Changeset db8756e in sasmodels

Timestamp:

Mar 13, 2015 4:37:58 PM (10 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

29aa28f

Parents:

d9633b1

Message:

have jenkins run the resolution tests

Files:

• extra/build_linux.sh (modified) (1 diff)
• sasmodels/model_test.py (modified) (2 diffs)
• sasmodels/resolution.py (modified) (2 diffs)

extra/build_linux.sh

@@ -12 +12 @@
 "$EASY_INSTALL" -d "$WORKSPACE/utils" unittest-xml-reporting pylint
 
-cd $WORKSPACE
-python -m sasmodels.model_test opencl_and_dll all || exit 1
+# Run tests
+STATUS=0
+python -m sasmodels.model_test opencl_and_dll all || STATUS=$?
+python -m sasmodels.resolution || STATUS=$?
 
-python extra/run-pylint.py > pylint_violations.txt || exit 0
+# Run lint
+python extra/run-pylint.py > pylint_violations.txt
+
+exit $STATUS
 
 

sasmodels/model_test.py

@@ -45 +45 @@
 
 import sys
-import xmlrunner
 import unittest
 
@@ -207 +206 @@
     Returns 0 if success or 1 if any tests fail.
     """
+    import xmlrunner
+
     models = sys.argv[1:]
     if models and models[0] == 'opencl':

sasmodels/resolution.py

@@ -430 +430 @@
 
 
+def main():
+    """
+    Run tests given is sys.argv.
+
+    Returns 0 if success or 1 if any tests fail.
+    """
+    import sys
+    import xmlrunner
+
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.defaultTestLoader.loadTestsFromModule(sys.modules[__name__]))
+
+    runner = xmlrunner.XMLTestRunner(output='logs')
+    result = runner.run(suite)
+    return 1 if result.failures or result.errors else 0
+
+
 ############################################################################
 # usage demo
@@ -476 +493 @@
 
 if __name__ == "__main__":
-    demo()
-
-
+    #demo()
+    main()
+
+