From edbac49f2bf96eb433d993fdbbc9de9b974c3995 Mon Sep 17 00:00:00 2001 From: Colin Dunklau Date: Tue, 26 Mar 2013 00:38:07 -0500 Subject: [PATCH] Nitpicking - tempdir naming, also backslashes are bad Tempdirs should have useful prefixes to aid in collecting information about failed tests. Implicit concatenation is better than backslash line continuation. --- pelican/tests/test_generators.py | 8 ++--- pelican/tests/test_pelican.py | 14 ++++----- pelican/tests/test_readers.py | 51 ++++++++++++++++---------------- pelican/tests/test_webassets.py | 2 +- 4 files changed, 38 insertions(+), 37 deletions(-) diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py index e6f2a5be..1e5a7339 100644 --- a/pelican/tests/test_generators.py +++ b/pelican/tests/test_generators.py @@ -8,8 +8,8 @@ from codecs import open from tempfile import mkdtemp from shutil import rmtree -from pelican.generators import ArticlesGenerator, PagesGenerator, \ - TemplatePagesGenerator +from pelican.generators import (ArticlesGenerator, PagesGenerator, + TemplatePagesGenerator) from pelican.writers import Writer from pelican.settings import _DEFAULT_CONFIG from pelican.tests.support import unittest, get_settings @@ -219,8 +219,8 @@ class TestTemplatePagesGenerator(unittest.TestCase): TEMPLATE_CONTENT = "foo: {{ foo }}" def setUp(self): - self.temp_content = mkdtemp() - self.temp_output = mkdtemp() + self.temp_content = mkdtemp(prefix='pelicantests.') + self.temp_output = mkdtemp(prefix='pelicantests.') def tearDown(self): rmtree(self.temp_content) diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py index c8f1daf5..5fd037f3 100644 --- a/pelican/tests/test_pelican.py +++ b/pelican/tests/test_pelican.py @@ -42,7 +42,7 @@ class TestPelican(LoggedTestCase): def setUp(self): super(TestPelican, self).setUp() - self.temp_path = mkdtemp() + self.temp_path = mkdtemp(prefix='pelicantests.') self.old_locale = locale.setlocale(locale.LC_ALL) self.maxDiff = None locale.setlocale(locale.LC_ALL, str('C')) @@ -53,12 +53,12 @@ class TestPelican(LoggedTestCase): super(TestPelican, self).tearDown() def assertFilesEqual(self, diff): - msg = "some generated files differ from the expected functional " \ - "tests output.\n" \ - "This is probably because the HTML generated files " \ - "changed. If these changes are normal, please refer " \ - "to docs/contribute.rst to update the expected " \ - "output of the functional tests." + msg = ("some generated files differ from the expected functional " + "tests output.\n" + "This is probably because the HTML generated files " + "changed. If these changes are normal, please refer " + "to docs/contribute.rst to update the expected " + "output of the functional tests.") self.assertEqual(diff['left_only'], [], msg=msg) self.assertEqual(diff['right_only'], [], msg=msg) diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py index ec88781b..137add2f 100644 --- a/pelican/tests/test_readers.py +++ b/pelican/tests/test_readers.py @@ -94,9 +94,9 @@ class RstReaderTest(unittest.TestCase): # unmodified content, _ = readers.read_file(_path('article.rst')) expected = ('

This is some content. With some stuff to ' - '"typogrify".

\n

Now with added ' - 'support for ' - 'TLA.

\n') + '"typogrify".

\n

Now with added ' + 'support for ' + 'TLA.

\n') self.assertEqual(content, expected) @@ -138,25 +138,26 @@ class MdReaderTest(unittest.TestCase): # correct reader content, metadata = reader.read( _path('article_with_md_extension.md')) - expected = "

Test Markdown File Header

\n"\ - "

Used for pelican test

\n"\ - "

The quick brown fox jumped over the lazy dog's back.

" + expected = ( + "

Test Markdown File Header

\n" + "

Used for pelican test

\n" + "

The quick brown fox jumped over the lazy dog's back.

") self.assertEqual(content, expected) # test to ensure the mkd file extension is being processed by the # correct reader content, metadata = reader.read( _path('article_with_mkd_extension.mkd')) - expected = "

Test Markdown File Header

\n

Used for pelican"\ - " test

\n

This is another markdown test file. Uses"\ - " the mkd extension.

" + expected = ("

Test Markdown File Header

\n

Used for pelican" + " test

\n

This is another markdown test file. Uses" + " the mkd extension.

") self.assertEqual(content, expected) # test to ensure the markdown file extension is being processed by the # correct reader content, metadata = reader.read( _path('article_with_markdown_extension.markdown')) - expected = "

Test Markdown File Header

\n

Used for pelican"\ - " test

\n

This is another markdown test file. Uses"\ - " the markdown extension.

" + expected = ("

Test Markdown File Header

\n

Used for pelican" + " test

\n

This is another markdown test file. Uses" + " the markdown extension.

") self.assertEqual(content, expected) @unittest.skipUnless(readers.Markdown, "markdown isn't installed") @@ -166,16 +167,16 @@ class MdReaderTest(unittest.TestCase): content, metadata = readers.read_file( _path('article_with_markdown_markup_extensions.md'), settings={'MD_EXTENSIONS': ['toc', 'codehilite', 'extra']}) - expected = '
\n'\ - '\n'\ - '
\n'\ - '

Level1

\n'\ - '

Level2

' + expected = ('
\n' + '\n' + '
\n' + '

Level1

\n' + '

Level2

') self.assertEqual(content, expected) @@ -231,9 +232,9 @@ class AdReaderTest(unittest.TestCase): content, metadata = reader.read( _path('article_with_asc_extension.asc')) expected = ('
\n

' - 'Used for pelican test

\n' - '

The quick brown fox jumped over' - ' the lazy dog’s back.

\n') + 'Used for pelican test\n' + '

The quick brown fox jumped over' + ' the lazy dog’s back.

\n') self.assertEqual(content, expected) expected = { 'category': 'Blog', diff --git a/pelican/tests/test_webassets.py b/pelican/tests/test_webassets.py index 22c0ae78..904c44ad 100644 --- a/pelican/tests/test_webassets.py +++ b/pelican/tests/test_webassets.py @@ -25,7 +25,7 @@ class TestWebAssets(unittest.TestCase): """Base class for testing webassets.""" def setUp(self, override=None): - self.temp_path = mkdtemp() + self.temp_path = mkdtemp(prefix='pelicantests.') settings = { 'PATH': os.path.join(CUR_DIR, 'content', 'TestCategory'), 'OUTPUT_PATH': self.temp_path,