Changeset b09aee8 in sasview for test


Ignore:
Timestamp:
Mar 20, 2018 10:13:51 AM (6 years ago)
Author:
GitHub <noreply@…>
Branches:
master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload
Children:
2a24d55, 0863065, fc25457, c16172d, 3b37edc
Parents:
85d98e2 (diff), 39a018b (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.
git-author:
Andrew Jackson <andrew.jackson@…> (03/20/18 10:13:51)
git-committer:
GitHub <noreply@…> (03/20/18 10:13:51)
Message:

Merge pull request #147 from llimeht/tmp/missing-test-resource

Fix finding of test resource

File:
1 edited

Legend:

Unmodified
Added
Removed
  • test/sascalculator/test/utest_sas_gen.py

    r5bb05a4 r39a018b  
    6060        Test that the calculator calculates. 
    6161        """ 
    62         f = self.omfloader.read("A_Raw_Example-1.omf") 
     62        f = self.omfloader.read(find("A_Raw_Example-1.omf")) 
    6363        omf2sld = sas_gen.OMF2SLD() 
    6464        omf2sld.set_data(f) 
Note: See TracChangeset for help on using the changeset viewer.