Changeset 9c0f3c17 in sasview for test/utest_sasview.py


Ignore:
Timestamp:
Apr 4, 2017 12:50:04 PM (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:
f2940c4
Parents:
463e7ffc (diff), 1779e72 (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:

After merge conflict

File:
1 edited

Legend:

Unmodified
Added
Removed
  • test/utest_sasview.py

    r35ec279 r463e7ffc  
    44import re 
    55import sys 
     6 
     7import logging 
     8import logging.config 
     9LOGGER_CONFIG_FILE = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'logging.ini') 
     10logging.config.fileConfig(LOGGER_CONFIG_FILE, disable_existing_loggers=False) 
     11logger = logging.getLogger(__name__) 
     12 
    613try: 
    714    import xmlrunner 
    815except: 
    9     print "xmlrunner needs to be installed to run these tests" 
    10     print "Try easy_install unittest-xml-reporting" 
     16    logger.error("xmlrunner needs to be installed to run these tests") 
     17    logger.error("Try easy_install unittest-xml-reporting") 
    1118    sys.exit(1) 
    1219 
Note: See TracChangeset for help on using the changeset viewer.