summaryrefslogtreecommitdiff
path: root/tests/admin_scripts/tests.py
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2017-01-24 12:22:42 +0100
committerClaude Paroz <claude@2xlibre.net>2017-01-24 18:45:54 +0100
commit2366100872ec17dde06abc63c1ad74dcf746b134 (patch)
treed6b5c393f8c2c2d01bcbb2295759f14bbf3aac05 /tests/admin_scripts/tests.py
parent5b95d421f7ab8deadaf3c1ad3f341bdfc85bfca4 (diff)
Removed unneeded force_text calls in the test suite
Diffstat (limited to 'tests/admin_scripts/tests.py')
-rw-r--r--tests/admin_scripts/tests.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py
index c8f5d2a20d..88a0260358 100644
--- a/tests/admin_scripts/tests.py
+++ b/tests/admin_scripts/tests.py
@@ -27,7 +27,6 @@ from django.db.migrations.recorder import MigrationRecorder
from django.test import (
LiveServerTestCase, SimpleTestCase, TestCase, override_settings,
)
-from django.utils.encoding import force_text
custom_templates_dir = os.path.join(os.path.dirname(__file__), 'custom_templates')
@@ -196,7 +195,6 @@ class AdminScriptTestCase(unittest.TestCase):
def assertOutput(self, stream, msg, regex=False):
"Utility assertion: assert that the given message exists in the output"
- stream = force_text(stream)
if regex:
self.assertIsNotNone(
re.search(msg, stream),
@@ -207,7 +205,6 @@ class AdminScriptTestCase(unittest.TestCase):
def assertNotInOutput(self, stream, msg):
"Utility assertion: assert that the given message doesn't exist in the output"
- stream = force_text(stream)
self.assertNotIn(msg, stream, "'%s' matches actual output text '%s'" % (msg, stream))
##########################################################################
@@ -2021,7 +2018,7 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase):
self.assertNoOutput(err)
test_manage_py = os.path.join(testproject_dir, 'manage.py')
with open(test_manage_py, 'r') as fp:
- content = force_text(fp.read())
+ content = fp.read()
self.assertIn("project_name = 'another_project'", content)
self.assertIn("project_directory = '%s'" % testproject_dir, content)