Skip to content
Browse files

Fixed order of test result and minor whitespace cleanup.

  • Loading branch information...
1 parent 91fdca5 commit 7d30c6424511f568f4c0f04e6f2295dcae695eed @jezdez jezdez committed Mar 3, 2012
Showing with 9 additions and 9 deletions.
  1. +4 −4 compressor/tests/__init__.py
  2. +5 −5 compressor/tests/offline.py
View
8 compressor/tests/__init__.py
@@ -8,10 +8,10 @@
OfflineGenerationBlockSuperTestCase,
OfflineGenerationBlockSuperTestCaseWithExtraContent,
OfflineGenerationBlockSuperMultipleTestCase,
- OfflineGenerationConditionTestCase,
- OfflineGenerationTemplateTagTestCase,
- OfflineGenerationTestCaseWithContext,
- OfflineGenerationTestCaseErrors,
+ OfflineGenerationConditionTestCase,
+ OfflineGenerationTemplateTagTestCase,
+ OfflineGenerationTestCaseWithContext,
+ OfflineGenerationTestCaseErrors,
OfflineGenerationTestCase,
OfflineGenerationTestCaseWithError)
from compressor.tests.parsers import (LxmlParserTests, Html5LibParserTests,
View
10 compressor/tests/offline.py
@@ -33,7 +33,7 @@ def setUp(self):
self.log = StringIO()
# Force template dirs, because it enables us to force compress to
- # consider only a specific directory (helps us make true,
+ # consider only a specific directory (helps us make true,
# independant unit tests).
settings.TEMPLATE_DIRS = (
os.path.join(settings.TEMPLATE_DIRS[0], self.templates_dir),
@@ -69,15 +69,15 @@ class OfflineGenerationBlockSuperTestCase(OfflineTestCaseMixin, TestCase):
templates_dir = "test_block_super"
expected_hash = "7c02d201f69d"
-
+
class OfflineGenerationBlockSuperMultipleTestCase(OfflineTestCaseMixin, TestCase):
templates_dir = "test_block_super_multiple"
expected_hash = "2f6ef61c488e"
class OfflineGenerationBlockSuperTestCaseWithExtraContent(OfflineTestCaseMixin, TestCase):
templates_dir = "test_block_super_extra"
-
+
def test_offline(self):
count, result = CompressCommand().compress(log=self.log, verbosity=self.verbosity)
self.assertEqual(2, count)
@@ -133,8 +133,8 @@ def test_offline(self):
count, result = CompressCommand().compress(log=self.log, verbosity=self.verbosity)
self.assertEqual(2, count)
self.assertEqual([
- u'<script type="text/javascript" src="/media/CACHE/js/cd8870829421.js"></script>',
u'<script type="text/javascript" src="/media/CACHE/js/3872c9ae3f42.js"></script>',
+ u'<script type="text/javascript" src="/media/CACHE/js/cd8870829421.js"></script>',
], result)
@@ -213,4 +213,4 @@ def test_get_loaders(self):
self.assertTrue(isinstance(loaders[0], FileSystemLoader))
self.assertTrue(isinstance(loaders[1], AppDirectoriesLoader))
finally:
- settings.TEMPLATE_LOADERS = old_loaders
+ settings.TEMPLATE_LOADERS = old_loaders

0 comments on commit 7d30c64

Please sign in to comment.
Something went wrong with that request. Please try again.