update file not found tests

Author: rcomer

lib/iris/io/__init__.py

@@ -169,10 +169,10 @@ def expand_filespecs(file_specs):
         msg = "One or more of the files specified did not exist:"
         for pattern, expanded in six.iteritems(glob_expanded):
             if expanded:
-                msg += '\n  - "{}" matched {} file(s)'.format(pattern,
+                msg += '\n    - "{}" matched {} file(s)'.format(pattern,
                                                               len(expanded))
             else:
-                msg += '\n  * "{}" expanded to empty'.format(pattern)
+                msg += '\n    * "{}" expanded to empty'.format(pattern)
         raise IOError(msg)
 
     return [fname for fnames in all_expanded for fname in fnames]

lib/iris/tests/unit/io/test_expand_filespecs.py

@@ -80,7 +80,7 @@ def test_return_order(self):
         self.assertEqual(result, expected[::-1])
 
     def test_no_files_found(self):
-        msg = r'\/no_exist.txt\" matched 0 file\(s\)'
+        msg = r'\/no_exist.txt\" expanded to empty'
         with self.assertRaisesRegexp(IOError, msg):
             iio.expand_filespecs([os.path.join(self.tmpdir, 'no_exist.txt')])
 
@@ -91,9 +91,8 @@ def test_files_and_none(self):
                  os.path.join(self.tmpdir, '*')])
         expected = textwrap.dedent("""
             One or more of the files specified did not exist:
-                - "{0}/does_not_exist.txt" matched 0 file(s)
+                * "{0}/does_not_exist.txt" expanded to empty
                 - "{0}/*" matched 2 file(s)
-                   - {0}/a.foo, {0}/b.txt
             """).strip().format(self.tmpdir)
 
         self.assertStringEqual(str(err.exception), expected)