summaryrefslogtreecommitdiff
path: root/silx/io/test/test_specfile.py
diff options
context:
space:
mode:
authorPicca Frédéric-Emmanuel <picca@debian.org>2017-10-07 07:59:01 +0200
committerPicca Frédéric-Emmanuel <picca@debian.org>2017-10-07 07:59:01 +0200
commitbfa4dba15485b4192f8bbe13345e9658c97ecf76 (patch)
treefb9c6e5860881fbde902f7cbdbd41dc4a3a9fb5d /silx/io/test/test_specfile.py
parentf7bdc2acff3c13a6d632c28c4569690ab106eed7 (diff)
New upstream version 0.6.0+dfsg
Diffstat (limited to 'silx/io/test/test_specfile.py')
-rw-r--r--silx/io/test/test_specfile.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/silx/io/test/test_specfile.py b/silx/io/test/test_specfile.py
index 884cb04..0aef2e2 100644
--- a/silx/io/test/test_specfile.py
+++ b/silx/io/test/test_specfile.py
@@ -25,7 +25,7 @@
__authors__ = ["P. Knobel", "V.A. Sole"]
__license__ = "MIT"
-__date__ = "24/04/2017"
+__date__ = "03/08/2017"
import gc
import locale
@@ -36,12 +36,14 @@ import sys
import tempfile
import unittest
-logging.basicConfig()
-logger1 = logging.getLogger(__name__)
+from silx.test import utils
from ..specfile import SpecFile, Scan
from .. import specfile
+
+logger1 = logging.getLogger(__name__)
+
sftext = """#F /tmp/sf.dat
#E 1455180875
#D Thu Feb 11 09:54:35 2016
@@ -374,6 +376,7 @@ class TestSpecFile(unittest.TestCase):
self.assertEqual(self.scan25.mca.channels,
[])
+ @utils.test_logging(specfile._logger.name, warning=1)
def test_empty_scan(self):
"""Test reading a scan with no data points"""
self.assertEqual(len(self.empty_scan.labels),