Merge tag 'upstream/7.6.0'

Upstream version 7.6.0

1 files changed, 11 insertions, 7 deletions

diff --git a/tests/test_utils.py b/tests/test_utils.py
index c392c02..1e2d3b3 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -34,7 +34,7 @@ class GetMetaTest(unittest.TestCase):
         post.metadata_path = 'file_with_metadata.meta'
 
         with mock.patch('nikola.post.io.open', opener_mock, create=True):
-            meta = get_meta(post)
+            meta, nsm = get_meta(post)
 
         self.assertEqual('Nikola needs more tests!', meta['title'])
         self.assertEqual('write-tests-now', meta['slug'])
@@ -42,6 +42,7 @@ class GetMetaTest(unittest.TestCase):
         self.assertFalse('tags' in meta)
         self.assertFalse('link' in meta)
         self.assertFalse('description' in meta)
+        self.assertTrue(nsm)
 
     def test_get_title_from_rest(self):
         file_metadata = [".. slug: write-tests-now\n",
@@ -60,7 +61,7 @@ class GetMetaTest(unittest.TestCase):
         post.metadata_path = 'file_with_metadata.meta'
 
         with mock.patch('nikola.post.io.open', opener_mock, create=True):
-            meta = get_meta(post)
+            meta, nsm = get_meta(post)
 
         self.assertEqual('Post Title', meta['title'])
         self.assertEqual('write-tests-now', meta['slug'])
@@ -68,6 +69,7 @@ class GetMetaTest(unittest.TestCase):
         self.assertFalse('tags' in meta)
         self.assertFalse('link' in meta)
         self.assertFalse('description' in meta)
+        self.assertTrue(nsm)
 
     def test_get_title_from_fname(self):
         file_metadata = [".. slug: write-tests-now\n",
@@ -84,7 +86,7 @@ class GetMetaTest(unittest.TestCase):
         post.metadata_path = 'file_with_metadata.meta'
 
         with mock.patch('nikola.post.io.open', opener_mock, create=True):
-            meta = get_meta(post, 'file_with_metadata')
+            meta, nsm = get_meta(post, 'file_with_metadata')
 
         self.assertEqual('file_with_metadata', meta['title'])
         self.assertEqual('write-tests-now', meta['slug'])
@@ -92,6 +94,7 @@ class GetMetaTest(unittest.TestCase):
         self.assertFalse('tags' in meta)
         self.assertFalse('link' in meta)
         self.assertFalse('description' in meta)
+        self.assertTrue(nsm)
 
     def test_use_filename_as_slug_fallback(self):
         file_metadata = [".. title: Nikola needs more tests!\n",
@@ -109,7 +112,7 @@ class GetMetaTest(unittest.TestCase):
         post.metadata_path = 'Slugify this.meta'
 
         with mock.patch('nikola.post.io.open', opener_mock, create=True):
-            meta = get_meta(post, 'Slugify this')
+            meta, nsm = get_meta(post, 'Slugify this')
 
         self.assertEqual('Nikola needs more tests!', meta['title'])
         self.assertEqual('slugify-this', meta['slug'])
@@ -117,13 +120,14 @@ class GetMetaTest(unittest.TestCase):
         self.assertFalse('tags' in meta)
         self.assertFalse('link' in meta)
         self.assertFalse('description' in meta)
+        self.assertTrue(nsm)
 
     def test_extracting_metadata_from_filename(self):
         post = dummy()
         post.source_path = '2013-01-23-the_slug-dubdubtitle.md'
         post.metadata_path = '2013-01-23-the_slug-dubdubtitle.meta'
         with mock.patch('nikola.post.io.open', create=True):
-            meta = get_meta(
+            meta, _ = get_meta(
                 post,
                 '(?P<date>\d{4}-\d{2}-\d{2})-(?P<slug>.*)-(?P<title>.*)\.md')
 
@@ -136,7 +140,7 @@ class GetMetaTest(unittest.TestCase):
         post.source_path = 'some/path/the_slug.md'
         post.metadata_path = 'some/path/the_slug.meta'
         with mock.patch('nikola.post.io.open', create=True):
-            meta = get_meta(post)
+            meta, _ = get_meta(post)
 
         self.assertEqual('the_slug', meta['slug'])
 
@@ -246,7 +250,7 @@ class TranslatableSettingsTest(unittest.TestCase):
         except NameError:  # Python 3
             u = str(S)
 
-        cn = S()      #   no language specified
+        cn = S()      #   no language specified
         cr = S('xx')  # real language specified
         cf = S('zz')  # fake language specified