Changeset 574adc7 in sasview for test

Timestamp:

Sep 22, 2017 4:01:32 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

34d7b35

Parents:

9706d88

Message:

convert sascalc to python 2/3 syntax

Location:

test

Files:

• sasdataloader/test/utest_abs_reader.py (modified) (2 diffs)
• sasdataloader/test/utest_cansas.py (modified) (3 diffs)
• utest_sasview.py (modified) (2 diffs)

test/sasdataloader/test/utest_abs_reader.py

@@ -224 +224 @@
                 _found2 = True
 
-        if _found1 == False or _found2 == False:
-            raise RuntimeError, "Could not find all data %s %s" % (_found1, _found2)
+        if not _found1 or not _found2:
+            raise RuntimeError("Could not find all data %s %s"
+                               % (_found1, _found2))
 
         # Detector
@@ -269 +270 @@
                     _found_term1 = True
 
-        if _found_term1 == False or _found_term2 == False:
-            raise RuntimeError, "Could not find all process terms %s %s" % (_found_term1, _found_term2)
+        if not _found_term1 or not _found_term2:
+            raise RuntimeError("Could not find all process terms %s %s"
+                               % (_found_term1, _found_term2))
 
     def test_writer(self):

test/sasdataloader/test/utest_cansas.py

@@ -2 +2 @@
     Unit tests for the new recursive cansas reader
 """
+import os
+import sys
+import StringIO
+import unittest
+import logging
+import warnings
+
+from lxml import etree
+from lxml.etree import XMLSyntaxError
+from xml.dom import minidom
+
 import sas.sascalc.dataloader.readers.cansas_reader as cansas
 from sas.sascalc.dataloader.loader import Loader
@@ -8 +19 @@
 from sas.sascalc.dataloader.readers.cansas_reader import Reader
 from sas.sascalc.dataloader.readers.cansas_constants import CansasConstants
-
-import os
-import sys
-import urllib2
-import StringIO
-import pylint as pylint
-import unittest
-import numpy as np
-import logging
-import warnings
-
-from lxml import etree
-from lxml.etree import XMLSyntaxError
-from xml.dom import minidom
 
 logger = logging.getLogger(__name__)
@@ -309 +306 @@
 
 if __name__ == '__main__':
-    unittest.main()    
+    unittest.main()

test/utest_sasview.py

@@ -62 +62 @@
                     proc = subprocess.Popen(code, shell=True, stdout=subprocess.PIPE, stderr = subprocess.STDOUT)
                     std_out, std_err = proc.communicate()
+                    std_out, std_err = std_out.decode(), (std_err.decode() if std_err else None)
                     #print(">>>>>> standard out", file_path, "\n", std_out, "\n>>>>>>>>> end stdout", file_path)
                     #sys.exit()
@@ -109 +110 @@
     if run_tests(dirs=dirs, all=all)>0:
         sys.exit(1)
-