[Zope3-checkins] CVS: Zope3/src/zope/app/traversing/ftests - test_vhosting.py:1.4
Marius Gedminas
mgedmin@codeworks.lt
Fri, 18 Apr 2003 02:42:54 -0400
Update of /cvs-repository/Zope3/src/zope/app/traversing/ftests
In directory cvs.zope.org:/tmp/cvs-serv31613/src/zope/app/traversing/ftests
Modified Files:
test_vhosting.py
Log Message:
Virtual hosting now omits default port numbers; update functional tests.
=== Zope3/src/zope/app/traversing/ftests/test_vhosting.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/traversing/ftests/test_vhosting.py:1.3 Wed Apr 16 02:54:42 2003
+++ Zope3/src/zope/app/traversing/ftests/test_vhosting.py Fri Apr 18 02:42:52 2003
@@ -33,18 +33,18 @@
self.verify('/++vh++/pt',
'http://localhost/pt/index.html\n')
self.verify('/++vh++https:otherhost:443/pt',
- 'https://otherhost:443/pt/index.html\n')
+ 'https://otherhost/pt/index.html\n')
self.verify('/++vh++https:otherhost:443/fake/folders/++/pt',
- 'https://otherhost:443/fake/folders/pt/index.html\n')
+ 'https://otherhost/fake/folders/pt/index.html\n')
self.addPage('/foo/bar/pt', u'<span tal:replace="request/URL"/>')
self.verify('/foo/bar/pt', 'http://localhost/foo/bar/pt/index.html\n')
self.verify('/foo/bar/++vh++/pt',
'http://localhost/pt/index.html\n')
self.verify('/foo/bar/++vh++https:otherhost:443/pt',
- 'https://otherhost:443/pt/index.html\n')
+ 'https://otherhost/pt/index.html\n')
self.verify('/foo/++vh++https:otherhost:443/fake/folders/++/bar/pt',
- 'https://otherhost:443/fake/folders/bar/pt/index.html\n')
+ 'https://otherhost/fake/folders/bar/pt/index.html\n')
def test_request_base(self):
self.addPage('/pt', u'<head></head>')
@@ -56,11 +56,11 @@
'</head>\n')
self.verify('/++vh++https:otherhost:443/pt',
'<head>\n'
- '<base href="https://otherhost:443/pt/index.html" />'
+ '<base href="https://otherhost/pt/index.html" />'
'\n</head>\n')
self.verify('/++vh++https:otherhost:443/fake/folders/++/pt',
'<head>\n<base href='
- '"https://otherhost:443/fake/folders/pt/index.html" />'
+ '"https://otherhost/fake/folders/pt/index.html" />'
'\n</head>\n')
self.addPage('/foo/bar/pt', u'<head></head>')
@@ -73,20 +73,20 @@
'</head>\n')
self.verify('/foo/bar/++vh++https:otherhost:443/pt',
'<head>\n'
- '<base href="https://otherhost:443/pt/index.html" />'
+ '<base href="https://otherhost/pt/index.html" />'
'\n</head>\n')
self.verify('/foo/++vh++https:otherhost:443/fake/folders/++/bar/pt',
'<head>\n<base href='
- '"https://otherhost:443/fake/folders/bar/pt/index.html" />'
+ '"https://otherhost/fake/folders/bar/pt/index.html" />'
'\n</head>\n')
def test_request_redirect(self):
self.addPage('/foo/index.html', u'Spam')
self.verifyRedirect('/foo', 'http://localhost/foo/index.html')
self.verifyRedirect('/++vh++https:otherhost:443/foo',
- 'https://otherhost:443/foo/index.html')
+ 'https://otherhost/foo/index.html')
self.verifyRedirect('/foo/++vh++https:otherhost:443/bar/++',
- 'https://otherhost:443/bar/index.html')
+ 'https://otherhost/bar/index.html')
def test_absolute_url(self):
self.addPage('/pt', u'<span tal:replace="template/@@absolute_url"/>')
@@ -94,9 +94,9 @@
self.verify('/++vh++/pt',
'http://localhost/pt\n')
self.verify('/++vh++https:otherhost:443/pt',
- 'https://otherhost:443/pt\n')
+ 'https://otherhost/pt\n')
self.verify('/++vh++https:otherhost:443/fake/folders/++/pt',
- 'https://otherhost:443/fake/folders/pt\n')
+ 'https://otherhost/fake/folders/pt\n')
self.addPage('/foo/bar/pt',
u'<span tal:replace="template/@@absolute_url"/>')
@@ -104,9 +104,9 @@
self.verify('/foo/bar/++vh++/pt',
'http://localhost/pt\n')
self.verify('/foo/bar/++vh++https:otherhost:443/pt',
- 'https://otherhost:443/pt\n')
+ 'https://otherhost/pt\n')
self.verify('/foo/++vh++https:otherhost:443/fake/folders/++/bar/pt',
- 'https://otherhost:443/fake/folders/bar/pt\n')
+ 'https://otherhost/fake/folders/bar/pt\n')
def test_resources(self):
provideResource('quux', IBrowserPresentation, Resource)