Changeset 00a6ec4 in sasview for test


Ignore:
Timestamp:
Apr 5, 2017 11:15:25 AM (7 years ago)
Author:
Ricardo Ferraz Leal <ricleal@…>
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, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
fd5d6eac
Parents:
4fb10e5 (diff), 5e2f36c (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.
Message:

Merge remote-tracking branch 'origin' into log_binning

Location:
test
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • test/logging.ini

    rebb0a55 raaad4c95  
    2929level=INFO 
    3030formatter=detailed 
    31 args=(os.path.join(os.path.expanduser("~"),'.sasview/tests.log'),"w") 
     31args=('tests.log','w') 
    3232 
    3333############################################################################### 

  • test/run_one.py

    r64ca561 raaad4c95  
    1515    logging.config.fileConfig(LOGGER_CONFIG_FILE, disable_existing_loggers=False) 
    1616 
     17if len(sys.argv) < 2: 
     18    logger.error("Use %s <filename to test>",sys.argv[0]) 
     19    sys.exit(-1) 
    1720 
    1821run_py = joinpath(dirname(dirname(abspath(__file__))), 'run.py') 

  • test/sasdataloader/test/testLoad.py

    r463e7ffc raaad4c95  
    1919    HAS_IMAGE = True 
    2020except: 
    21     print "IMAGE TESTS WILL NOT BE PERFORMED: MISSING PIL MODULE" 
     21    logger.info("IMAGE TESTS WILL NOT BE PERFORMED: MISSING PIL MODULE") 
    2222     
    2323import os.path 

  • test/utest_sasview.py

    rebb0a55 raaad4c95  
    88import logging.config 
    99LOGGER_CONFIG_FILE = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'logging.ini') 
    10 print LOGGER_CONFIG_FILE 
    1110logging.config.fileConfig(LOGGER_CONFIG_FILE) 
    1211logger = logging.getLogger(__name__) 
    … …  
    5049            continue 
    5150         
     51 
    5252        # Go through modules looking for unit tests 
    5353        module_dir = os.path.join(test_root, d, "test") 

  • test/sasdataloader/test/utest_averaging.py

    r9a5097c r4fb10e5  
    22import unittest 
    33import math 
     4import os 
    45 
    56from sas.sascalc.dataloader.loader import  Loader 
    … …  
    9798     
    9899    def setUp(self): 
    99         self.data = Loader().load('MAR07232_rest.ASC') 
     100        filepath = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'MAR07232_rest.ASC') 
     101        self.data = Loader().load(filepath) 
    100102         
    101103    def test_ring(self): 
    … …  
    110112         
    111113        o = r(self.data) 
    112         answer = Loader().load('ring_testdata.txt') 
     114        filepath = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'ring_testdata.txt') 
     115        answer = Loader().load(filepath) 
    113116         
    114117        for i in range(r.nbins_phi - 1): 
    … …  
    128131        o = r(self.data) 
    129132 
    130         answer = Loader().load('avg_testdata.txt') 
     133        filepath = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'avg_testdata.txt') 
     134        answer = Loader().load(filepath) 
    131135        for i in range(r.nbins_phi): 
    132136            self.assertAlmostEqual(o.x[i], answer.x[i], 4) 
    … …  
    163167        o = r(self.data) 
    164168 
    165         answer = Loader().load('slabx_testdata.txt') 
     169        filepath = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'slabx_testdata.txt') 
     170        answer = Loader().load(filepath) 
    166171        for i in range(len(o.x)): 
    167172            self.assertAlmostEqual(o.x[i], answer.x[i], 4) 
    … …  
    180185        o = r(self.data) 
    181186 
    182         answer = Loader().load('slaby_testdata.txt') 
     187        filepath = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'slaby_testdata.txt') 
     188        answer = Loader().load(filepath) 
    183189        for i in range(len(o.x)): 
    184190            self.assertAlmostEqual(o.x[i], answer.x[i], 4) 
    … …  
    207213        o = r(self.data) 
    208214 
    209         answer = Loader().load('ring_testdata.txt') 
     215        filepath = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'ring_testdata.txt') 
     216        answer = Loader().load(filepath) 
    210217        for i in range(len(o.x)): 
    211218            self.assertAlmostEqual(o.x[i], answer.x[i], 4) 
    … …  
    225232        o = r(self.data) 
    226233 
    227         answer = Loader().load('sectorphi_testdata.txt') 
     234        filepath = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'sectorphi_testdata.txt') 
     235        answer = Loader().load(filepath) 
    228236        for i in range(len(o.x)): 
    229237            self.assertAlmostEqual(o.x[i], answer.x[i], 4) 
    … …  
    243251        o = r(self.data) 
    244252 
    245         answer = Loader().load('sectorq_testdata.txt') 
     253        filepath = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'sectorq_testdata.txt') 
     254        answer = Loader().load(filepath) 
    246255        for i in range(len(o.x)): 
    247256            self.assertAlmostEqual(o.x[i], answer.x[i], 4) 
Note: See TracChangeset for help on using the changeset viewer.