diff options
| author | Alexandre Marie <alexandre.marie@synchrotron-soleil.fr> | 2018-12-17 12:28:24 +0100 |
|---|---|---|
| committer | Alexandre Marie <alexandre.marie@synchrotron-soleil.fr> | 2018-12-17 12:28:24 +0100 |
| commit | cebdc9244c019224846cb8d2668080fe386a6adc (patch) | |
| tree | aedec55da0f9dd4fc4d6c7eb0f58489a956e2e8c /silx/io/test/test_utils.py | |
| parent | 159ef14fb9e198bb0066ea14e6b980f065de63dd (diff) | |
New upstream version 0.9.0+dfsg
Diffstat (limited to 'silx/io/test/test_utils.py')
| -rw-r--r-- | silx/io/test/test_utils.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/silx/io/test/test_utils.py b/silx/io/test/test_utils.py index 53e001c..23b1124 100644 --- a/silx/io/test/test_utils.py +++ b/silx/io/test/test_utils.py @@ -1,6 +1,6 @@ # coding: utf-8 # /*########################################################################## -# Copyright (C) 2016-2017 European Synchrotron Radiation Facility +# Copyright (C) 2016-2018 European Synchrotron Radiation Facility # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -63,7 +63,7 @@ expected_spec1 = r"""#F .* 3 6\.00 """ -expected_spec2 = expected_spec1 + """ +expected_spec2 = expected_spec1 + r""" #S 2 Ordinate2 #D .* #N 2 @@ -362,14 +362,14 @@ class TestOpen(unittest.TestCase): f = utils.open(self.spec_filename) self.assertIsNotNone(f) if h5py is not None: - self.assertEquals(f.h5py_class, h5py.File) + self.assertEqual(f.h5py_class, h5py.File) f.close() def testSpecWith(self): with utils.open(self.spec_filename) as f: self.assertIsNotNone(f) if h5py is not None: - self.assertEquals(f.h5py_class, h5py.File) + self.assertEqual(f.h5py_class, h5py.File) def testEdf(self): if h5py is None: @@ -379,7 +379,7 @@ class TestOpen(unittest.TestCase): f = utils.open(self.edf_filename) self.assertIsNotNone(f) - self.assertEquals(f.h5py_class, h5py.File) + self.assertEqual(f.h5py_class, h5py.File) f.close() def testEdfWith(self): @@ -390,7 +390,7 @@ class TestOpen(unittest.TestCase): with utils.open(self.edf_filename) as f: self.assertIsNotNone(f) - self.assertEquals(f.h5py_class, h5py.File) + self.assertEqual(f.h5py_class, h5py.File) def testUnsupported(self): self.assertRaises(IOError, utils.open, self.txt_filename) |