Changeset 33e475a in sasmodels for sasmodels/model_test.py

Timestamp:

Aug 26, 2017 8:17:30 PM (7 years ago)

Author:

paperspace <paperspace@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

573ffab

Parents:

d439007 (diff), bedb9b0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasmodels.git

File:

• sasmodels/model_test.py (modified) (4 diffs)

sasmodels/model_test.py

@@ -47 +47 @@
 import sys
 import unittest
+
+try:
+    from StringIO import StringIO
+except ImportError:
+    # StringIO.StringIO renamed to io.StringIO in Python 3
+    # Note: io.StringIO exists in python 2, but using unicode instead of str
+    from io import StringIO
 
 import numpy as np  # type: ignore
@@ -337 +344 @@
 
 def run_one(model):
-    # type: (str) -> None
+    # type: (str) -> str
     """
     Run the tests for a single model, printing the results to stdout.
@@ -350 +357 @@
 
     # Build a object to capture and print the test results
-    stream = _WritelnDecorator(sys.stdout)  # Add writeln() method to stream
+    stream = _WritelnDecorator(StringIO())  # Add writeln() method to stream
     verbosity = 2
     descriptions = True
@@ -388 +395 @@
     else:
         stream.writeln("Note: no test suite created --- this should never happen")
+
+    output = stream.getvalue()
+    stream.close()
+    return output