Changeset 65314f7 in sasmodels


Ignore:
Timestamp:
Sep 1, 2017 6:47:21 AM (2 years ago)
Author:
lewis
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
61a4bd4
Parents:
bcdd6c9
Message:

Ensure tests for new sum/multi models pass

Location:
sasmodels
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/model_test.py

    rbedb9b0 r65314f7  
    201201                ({}, 'VR', None), 
    202202                ] 
    203  
    204             tests = smoke_tests + self.info.tests 
     203            tests = smoke_tests 
     204            if self.info.tests is not None: 
     205                tests += self.info.tests 
    205206            try: 
    206207                model = build_model(self.info, dtype=self.dtype, 
     
    371372        stream.writeln(traceback.format_exc()) 
    372373        return 
    373  
    374374    # Run the test suite 
    375375    suite.run(result) 
  • sasmodels/modelinfo.py

    r724257c r65314f7  
    718718    models when the model is first called, not when the model is loaded. 
    719719    """ 
     720    if hasattr(kernel_module, "model_info"): 
     721        # Custom sum/multi models 
     722        return kernel_module.model_info 
    720723    info = ModelInfo() 
    721724    #print("make parameter table", kernel_module.parameters) 
Note: See TracChangeset for help on using the changeset viewer.