Changeset be51cf6 in sasview

Timestamp:

Sep 18, 2017 9:46:28 AM (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:

5e2267e

Parents:

f12d96e

Message:

fix corfunc tests

Location:

test

Files:

• corfunc/test/utest_corfunc.py (modified) (3 diffs)
• utest_sasview.py (modified) (2 diffs)

test/corfunc/test/utest_corfunc.py

@@ -19 +19 @@
 
     def extrapolate(self):
-        params, extrapolation = self.calculator.compute_extrapolation()
+        params, extrapolation, s2 = self.calculator.compute_extrapolation()
 
         # Check the extrapolation parameters
@@ -57 +57 @@
                 break
 
-    def transform_callback(self, transform):
-        self.assertIsNotNone(transform)
-        self.assertAlmostEqual(transform.y[0], 1)
-        self.assertAlmostEqual(transform.y[-1], 0, 5)
-        self.transformation = transform
+    def transform_callback(self, transforms):
+        transform1, transform3, idf = transforms
+        self.assertIsNotNone(transform1)
+        self.assertAlmostEqual(transform1.y[0], 1)
+        self.assertAlmostEqual(transform1.y[-1], 0, 5)
+        self.transformation = transform1
 
     def extract_params(self):
@@ -77 +78 @@
                 test()
             except Exception as e:
+                raise
                 self.fail("{} failed ({}: {})".format(test, type(e), e))
 

test/utest_sasview.py

@@ -62 +62 @@
                     proc = subprocess.Popen(code, shell=True, stdout=subprocess.PIPE, stderr = subprocess.STDOUT)
                     std_out, std_err = proc.communicate()
-                    #print std_out
+                    #print(">>>>>> standard out", file_path, "\n", std_out, "\n>>>>>>>>> end stdout", file_path)
                     #sys.exit()
                     m = re.search("Ran ([0-9]+) test", std_out)
@@ -82 +82 @@
                         failed += 1
                         print("Result for %s (%s): FAILED" % (module_name, module_dir))
-                        print(std_out)
+                        #print(std_out)
                     else:
                         passed += 1