Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
Zope
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
Zope
Commits
3f7e3b81
Commit
3f7e3b81
authored
May 20, 2010
by
Tres Seaver
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove fossilized testing hair, module-scope imports.
parent
a6c66acc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
55 additions
and
61 deletions
+55
-61
src/Products/SiteAccess/tests/testSiteRoot.py
src/Products/SiteAccess/tests/testSiteRoot.py
+20
-26
src/Products/SiteAccess/tests/testVirtualHostMonster.py
src/Products/SiteAccess/tests/testVirtualHostMonster.py
+35
-35
No files found.
src/Products/SiteAccess/tests/testSiteRoot.py
View file @
3f7e3b81
...
@@ -4,47 +4,41 @@ These tests verify that the request URL headers, in particular ACTUAL_URL, are
...
@@ -4,47 +4,41 @@ These tests verify that the request URL headers, in particular ACTUAL_URL, are
set correctly when a SiteRoot is used.
set correctly when a SiteRoot is used.
See http://www.zope.org/Collectors/Zope/2077
See http://www.zope.org/Collectors/Zope/2077
"""
"""
from
Testing.makerequest
import
makerequest
import
Zope2
Zope2
.
startup
()
import
transaction
import
unittest
import
unittest
class
SiteRootRegressions
(
unittest
.
TestCase
):
class
SiteRootRegressions
(
unittest
.
TestCase
):
def
setUp
(
self
):
def
setUp
(
self
):
import
transaction
from
Testing.makerequest
import
makerequest
from
Testing.ZopeTestCase.ZopeLite
import
app
transaction
.
begin
()
transaction
.
begin
()
self
.
app
=
makerequest
(
Zope2
.
app
())
self
.
app
=
makerequest
(
app
())
try
:
self
.
app
.
manage_addFolder
(
'folder'
)
self
.
app
.
manage_addFolder
(
'folder'
)
p_disp
=
self
.
app
.
folder
.
manage_addProduct
[
'SiteAccess'
]
self
.
app
.
folder
.
manage_addProduct
[
'SiteAccess'
].
manage_addSiteRoot
(
title
=
'SiteRoot'
,
base
=
'http://test_base'
,
path
=
'/test_path'
)
p_disp
.
manage_addSiteRoot
(
title
=
'SiteRoot'
,
self
.
app
.
REQUEST
.
set
(
'PARENTS'
,
[
self
.
app
])
base
=
'http://test_base'
,
self
.
app
.
REQUEST
.
traverse
(
'/folder'
)
path
=
'/test_path'
)
self
.
app
.
REQUEST
.
set
(
'PARENTS'
,
[
self
.
app
])
except
:
self
.
app
.
REQUEST
.
traverse
(
'/folder'
)
self
.
tearDown
()
def
tearDown
(
self
):
def
tearDown
(
self
):
import
transaction
transaction
.
abort
()
transaction
.
abort
()
self
.
app
.
_p_jar
.
close
()
self
.
app
.
_p_jar
.
close
()
def
testRequest
(
self
):
def
testRequest
(
self
):
self
.
assertEqual
(
self
.
app
.
REQUEST
[
'SERVER_URL'
],
'http://test_base'
)
self
.
assertEqual
(
self
.
app
.
REQUEST
[
'SERVER_URL'
],
'http://test_base'
)
self
.
assertEqual
(
self
.
app
.
REQUEST
[
'URL'
],
'http://test_base/test_path/index_html'
)
self
.
assertEqual
(
self
.
app
.
REQUEST
[
'URL'
],
self
.
assertEqual
(
self
.
app
.
REQUEST
[
'ACTUAL_URL'
],
'http://test_base/test_path'
)
'http://test_base/test_path/index_html'
)
def
testAbsoluteUrl
(
self
):
self
.
assertEqual
(
self
.
app
.
REQUEST
[
'ACTUAL_URL'
],
self
.
assertEqual
(
self
.
app
.
folder
.
absolute_url
(),
'http://test_base/test_path'
)
'http://test_base/test_path'
)
def
testAbsoluteUrl
(
self
):
self
.
assertEqual
(
self
.
app
.
folder
.
absolute_url
(),
'http://test_base/test_path'
)
def
test_suite
():
def
test_suite
():
suite
=
unittest
.
TestSuite
()
suite
=
unittest
.
TestSuite
()
suite
.
addTest
(
unittest
.
makeSuite
(
SiteRootRegressions
))
suite
.
addTest
(
unittest
.
makeSuite
(
SiteRootRegressions
))
return
suite
return
suite
if
__name__
==
'__main__'
:
unittest
.
main
(
defaultTest
=
'test_suite'
)
src/Products/SiteAccess/tests/testVirtualHostMonster.py
View file @
3f7e3b81
...
@@ -6,38 +6,30 @@ works correctly in a VHM environment.
...
@@ -6,38 +6,30 @@ works correctly in a VHM environment.
Also see http://zope.org/Collectors/Zope/809
Also see http://zope.org/Collectors/Zope/809
Note: Tests require Zope >= 2.7
Note: Tests require Zope >= 2.7
$Id$
"""
"""
from
Testing.makerequest
import
makerequest
import
Zope2
Zope2
.
startup
()
import
transaction
import
unittest
import
unittest
class
VHMRegressions
(
unittest
.
TestCase
):
class
VHMRegressions
(
unittest
.
TestCase
):
def
setUp
(
self
):
def
setUp
(
self
):
import
transaction
from
Testing.makerequest
import
makerequest
from
Testing.ZopeTestCase.ZopeLite
import
app
transaction
.
begin
()
transaction
.
begin
()
self
.
app
=
makerequest
(
Zope2
.
app
())
self
.
app
=
makerequest
(
app
())
try
:
if
'virtual_hosting'
not
in
self
.
app
.
objectIds
():
if
not
hasattr
(
self
.
app
,
'virtual_hosting'
):
# If ZopeLite was imported, we have no default virtual
# If ZopeLite was imported, we have no default virtual host monster
# host monster
from
Products.SiteAccess.VirtualHostMonster
import
manage_addVirtualHostMonster
from
Products.SiteAccess.VirtualHostMonster
\
manage_addVirtualHostMonster
(
self
.
app
,
'virtual_hosting'
)
import
manage_addVirtualHostMonster
self
.
app
.
manage_addFolder
(
'folder'
)
manage_addVirtualHostMonster
(
self
.
app
,
'virtual_hosting'
)
self
.
app
.
folder
.
manage_addDTMLMethod
(
'doc'
,
''
)
self
.
app
.
manage_addFolder
(
'folder'
)
self
.
app
.
REQUEST
.
set
(
'PARENTS'
,
[
self
.
app
])
self
.
app
.
folder
.
manage_addDTMLMethod
(
'doc'
,
''
)
self
.
traverse
=
self
.
app
.
REQUEST
.
traverse
self
.
app
.
REQUEST
.
set
(
'PARENTS'
,
[
self
.
app
])
except
:
self
.
traverse
=
self
.
app
.
REQUEST
.
traverse
self
.
tearDown
()
def
tearDown
(
self
):
def
tearDown
(
self
):
import
transaction
transaction
.
abort
()
transaction
.
abort
()
self
.
app
.
_p_jar
.
close
()
self
.
app
.
_p_jar
.
close
()
...
@@ -61,14 +53,26 @@ class VHMRegressions(unittest.TestCase):
...
@@ -61,14 +53,26 @@ class VHMRegressions(unittest.TestCase):
def
test_actual_url
(
self
):
def
test_actual_url
(
self
):
self
.
app
.
folder
.
manage_addDTMLMethod
(
'index_html'
,
''
)
self
.
app
.
folder
.
manage_addDTMLMethod
(
'index_html'
,
''
)
ob
=
self
.
traverse
(
'/VirtualHostBase/http/www.mysite.com:80/folder/VirtualHostRoot/doc/'
)
self
.
assertEqual
(
self
.
app
.
REQUEST
[
'ACTUAL_URL'
],
'http://www.mysite.com/doc/'
)
ob
=
self
.
traverse
(
'/VirtualHostBase/http/www.mysite.com:80'
ob
=
self
.
traverse
(
'/VirtualHostBase/http/www.mysite.com:80/folder/VirtualHostRoot/doc'
)
'/folder/VirtualHostRoot/doc/'
)
self
.
assertEqual
(
self
.
app
.
REQUEST
[
'ACTUAL_URL'
],
'http://www.mysite.com/doc'
)
self
.
assertEqual
(
self
.
app
.
REQUEST
[
'ACTUAL_URL'
],
ob
=
self
.
traverse
(
'/VirtualHostBase/http/www.mysite.com:80/folder/VirtualHostRoot/'
)
'http://www.mysite.com/doc/'
)
self
.
assertEqual
(
self
.
app
.
REQUEST
[
'ACTUAL_URL'
],
'http://www.mysite.com/'
)
ob
=
self
.
traverse
(
'/VirtualHostBase/http/www.mysite.com:80/folder/VirtualHostRoot'
)
ob
=
self
.
traverse
(
'/VirtualHostBase/http/www.mysite.com:80'
self
.
assertEqual
(
self
.
app
.
REQUEST
[
'ACTUAL_URL'
],
'http://www.mysite.com/'
)
'/folder/VirtualHostRoot/doc'
)
self
.
assertEqual
(
self
.
app
.
REQUEST
[
'ACTUAL_URL'
],
'http://www.mysite.com/doc'
)
ob
=
self
.
traverse
(
'/VirtualHostBase/http/www.mysite.com:80'
'/folder/VirtualHostRoot/'
)
self
.
assertEqual
(
self
.
app
.
REQUEST
[
'ACTUAL_URL'
],
'http://www.mysite.com/'
)
ob
=
self
.
traverse
(
'/VirtualHostBase/http/www.mysite.com:80'
'/folder/VirtualHostRoot'
)
self
.
assertEqual
(
self
.
app
.
REQUEST
[
'ACTUAL_URL'
],
'http://www.mysite.com/'
)
def
gen_cases
():
def
gen_cases
():
for
vbase
,
ubase
in
(
for
vbase
,
ubase
in
(
...
@@ -174,7 +178,3 @@ def test_suite():
...
@@ -174,7 +178,3 @@ def test_suite():
suite
.
addTest
(
unittest
.
makeSuite
(
VHMRegressions
))
suite
.
addTest
(
unittest
.
makeSuite
(
VHMRegressions
))
suite
.
addTest
(
unittest
.
makeSuite
(
VHMAddingTests
))
suite
.
addTest
(
unittest
.
makeSuite
(
VHMAddingTests
))
return
suite
return
suite
if
__name__
==
'__main__'
:
unittest
.
main
(
defaultTest
=
'test_suite'
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment