Changeset 8f8100a in sasview

Timestamp:

Apr 5, 2017 10:56:17 AM (8 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:

7b15990

Parents:

aaad4c95 (diff), eba7bad (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 branch 'logger' of github.com:SasView/sasview into logger

Files:

• .gitignore (modified) (1 diff)
• test/logging.ini (modified) (1 diff)
• test/run_one.py (modified) (1 diff)
• test/sasdataloader/test/testLoad.py (modified) (1 diff)
• test/utest_sasview.py (modified) (2 diffs)

.gitignore

@@ -58 +58 @@
 /test/sasdataloader/test/isis_1_1_write_test.xml
 /test/sasdataloader/test/write_test.xml
+test*log
 
 # autogenerated scripts

test/logging.ini

@@ -29 +29 @@
 level=INFO
 formatter=detailed
-args=(os.path.join(os.path.expanduser("~"),'.sasview/tests.log'),"w")
+args=('tests.log','w')
 
 ###############################################################################

test/run_one.py

@@ -15 +15 @@
     logging.config.fileConfig(LOGGER_CONFIG_FILE, disable_existing_loggers=False)
 
+if len(sys.argv) < 2:
+    logger.error("Use %s <filename to test>",sys.argv[0])
+    sys.exit(-1)
 
 run_py = joinpath(dirname(dirname(abspath(__file__))), 'run.py')

test/sasdataloader/test/testLoad.py

@@ -19 +19 @@
     HAS_IMAGE = True
 except:
-    print "IMAGE TESTS WILL NOT BE PERFORMED: MISSING PIL MODULE"
+    logger.info("IMAGE TESTS WILL NOT BE PERFORMED: MISSING PIL MODULE")
     
 import os.path

test/utest_sasview.py

@@ -8 +8 @@
 import logging.config
 LOGGER_CONFIG_FILE = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'logging.ini')
-print LOGGER_CONFIG_FILE
 logging.config.fileConfig(LOGGER_CONFIG_FILE)
 logger = logging.getLogger(__name__)
@@ -50 +49 @@
             continue
         
+
         # Go through modules looking for unit tests
         module_dir = os.path.join(test_root, d, "test")