Author: jezdez
Date: 2011-12-09 13:50:28 -0800 (Fri, 09 Dec 2011)
New Revision: 17183
Modified:
django/trunk/tests/regressiontests/admin_scripts/tests.py
Log:
Fixed #16683 -- Skip the IPv6 runserver tests if the platform doesn't support
it.
Modified: django/trunk/tests/regressiontests/admin_scripts/tests.py
===================================================================
--- django/trunk/tests/regressiontests/admin_scripts/tests.py 2011-12-09
21:43:24 UTC (rev 17182)
+++ django/trunk/tests/regressiontests/admin_scripts/tests.py 2011-12-09
21:50:28 UTC (rev 17183)
@@ -7,6 +7,7 @@
import os
import shutil
+import socket
import sys
import re
@@ -1056,11 +1057,14 @@
self.assertNoOutput(err)
self.assertOutput(out, '0 errors found')
+
class ManageRunserver(AdminScriptTestCase):
def setUp(self):
from django.core.management.commands.runserver import
BaseRunserverCommand
- def monkey_run(*args, **options): return
+ def monkey_run(*args, **options):
+ return
+
self.cmd = BaseRunserverCommand()
self.cmd.run = monkey_run
@@ -1080,7 +1084,8 @@
self.cmd.handle(addrport="7000")
self.assertServerSettings('127.0.0.1', '7000')
- # IPv6
+ @unittest.skipUnless(socket.has_ipv6, 'markdown is installed')
+ def test_runner_addrport_ipv6(self):
self.cmd.handle(addrport="", use_ipv6=True)
self.assertServerSettings('::1', '8000', ipv6=True, raw_ipv6=True)
@@ -1090,18 +1095,19 @@
self.cmd.handle(addrport="[2001:0db8:1234:5678::9]:7000")
self.assertServerSettings('2001:0db8:1234:5678::9', '7000', ipv6=True,
raw_ipv6=True)
- # Hostname
+ def test_runner_hostname(self):
self.cmd.handle(addrport="localhost:8000")
self.assertServerSettings('localhost', '8000')
self.cmd.handle(addrport="test.domain.local:7000")
self.assertServerSettings('test.domain.local', '7000')
+ @unittest.skipUnless(socket.has_ipv6, 'markdown is installed')
+ def test_runner_hostname_ipv6(self):
self.cmd.handle(addrport="test.domain.local:7000", use_ipv6=True)
self.assertServerSettings('test.domain.local', '7000', ipv6=True)
- # Potentially ambiguous
-
+ def test_runner_ambiguous(self):
# Only 4 characters, all of which could be in an ipv6 address
self.cmd.handle(addrport="beef:7654")
self.assertServerSettings('beef', '7654')
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
