Changeset be51cf6 in sasview for test


Ignore:
Timestamp:
Sep 18, 2017 9:46:28 AM (21 months 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:
2 edited

Legend:

Unmodified
Added
Removed
  • test/corfunc/test/utest_corfunc.py

    r253eb6c6 rbe51cf6  
    1919 
    2020    def extrapolate(self): 
    21         params, extrapolation = self.calculator.compute_extrapolation() 
     21        params, extrapolation, s2 = self.calculator.compute_extrapolation() 
    2222 
    2323        # Check the extrapolation parameters 
     
    5757                break 
    5858 
    59     def transform_callback(self, transform): 
    60         self.assertIsNotNone(transform) 
    61         self.assertAlmostEqual(transform.y[0], 1) 
    62         self.assertAlmostEqual(transform.y[-1], 0, 5) 
    63         self.transformation = transform 
     59    def transform_callback(self, transforms): 
     60        transform1, transform3, idf = transforms 
     61        self.assertIsNotNone(transform1) 
     62        self.assertAlmostEqual(transform1.y[0], 1) 
     63        self.assertAlmostEqual(transform1.y[-1], 0, 5) 
     64        self.transformation = transform1 
    6465 
    6566    def extract_params(self): 
     
    7778                test() 
    7879            except Exception as e: 
     80                raise 
    7981                self.fail("{} failed ({}: {})".format(test, type(e), e)) 
    8082 
  • test/utest_sasview.py

    rb54440d rbe51cf6  
    6262                    proc = subprocess.Popen(code, shell=True, stdout=subprocess.PIPE, stderr = subprocess.STDOUT) 
    6363                    std_out, std_err = proc.communicate() 
    64                     #print std_out 
     64                    #print(">>>>>> standard out", file_path, "\n", std_out, "\n>>>>>>>>> end stdout", file_path) 
    6565                    #sys.exit() 
    6666                    m = re.search("Ran ([0-9]+) test", std_out) 
     
    8282                        failed += 1 
    8383                        print("Result for %s (%s): FAILED" % (module_name, module_dir)) 
    84                         print(std_out) 
     84                        #print(std_out) 
    8585                    else: 
    8686                        passed += 1 
Note: See TracChangeset for help on using the changeset viewer.