3555

pending completion

Build # 3555

Build Type

cron

travis-ci

Committed by

web-flow

Commit Message

<a href="https://github.com/zopefoundation/Zope/commit/<a class=hub.com/zopefoundation/Zope/commit/<a class="double-link" href="https://git"><a class=hub.com/zopefoundation/Zope/commit/12a4c8826448d7cde245de205c9514128ae86a9c">12a4c8826<a href="https://github.com/zopefoundation/Zope/commit/12a4c8826448d7cde245de205c9514128ae86a9c">&lt;a href=&quot;https://github.com/zopefoundation/Zope/commit/12a4c8826448d7cde245de205c9514128ae86a9c">&quot;&gt;Restore WebDAV functionality (#772)

* Move in the code from Zope.

Based on zopefoundation/Zope@&lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/zopefoundation/Zope/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/zopefoundation/Zope/commit/d1536a577d15f7a35fc459283797223d00343aa1&quot;&gt;d1536a577&lt;/a&gt;&quot;&gt;d1536a577&lt;/a&gt;&lt;a href=&quot;https://github.com/zopefoundation/Zope/commit/12a4c8826448d7cde245de205c9514128ae86a9c&quot;&gt;.

* Move new Zope2.startup.config module into ZServer.

* Add explicit security declaration on webdav.Collection class.

* Move IFTPAccess from OFS.

* flake8

* Use `@implementer` class decorator.

* pep8

* Fix deprecations (#10)

* A released Zope is enough.
* Fix deprecation warnings occurring during a test run.
* Update to versions requested by buildout.cfg.
* Add coveralls.
* Add coverage config.

* - checkpoint checkin

* - checkpoint checkin

* - unit tests passing

* - satisfy isort

* - satisfy flake8

* - remove long-deprecated items

* - more cleanup

* - fixes with help from the Litmus Test (http://www.webdav.org/neon/litmus/)

* - setting Connection header is forbidden for WSGI

See https://www.python.org/dev/peps/pep-3333/#other-http-features

* Revert &quot;Remove `Control_Panel/DavLocks`.&quot;

This reverts commit </a><a class="double-link" href="https://github.com/zopefoundation/Zope/commit/<a class="double-link" href="https://github.com/zopefoundation/Zope/commit/eec9a4771db7b477dfa7270ba4e79c3545084415">eec9a4771</a>">eec9a4771</a><a href="https://github.com/zopefoundation/Zope/commit/12a4c8826448d7cde245de205c9514128ae86a9c">.

* - lint fixes

* - fix up the old ZMI pages for locks and Null Resources

* - don&#39;t show lock icon for all path elements

* - remove faux implementation to make locking work

* - set ETags, so more Litmus tests pass

* - more fixes to improve Litmus coverage and real-life tests with cadaver

* - reinstate setting enable-ms-public-header

* - remove all references to FTP

* - add icons for the lock manager and... (continued)

Run Details

1437 of 2648 branches covered (54.27%)

Branch coverage included in aggregate %.

2439 of 2439 new or added lines in 37 files covered. (100.0%)

9245 of 11148 relevant lines covered (82.93%)

3.32 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

95.52

/src/webdav/tests/testPUT_factory.py

import base64
import unittest

import transaction
import Zope2
from Products.SiteAccess.VirtualHostMonster import VirtualHostMonster
from Testing.makerequest import makerequest


auth_info = b'Basic %s' % base64.encodebytes(b'manager:secret').rstrip()

Zope2.startup_wsgi()


class TestPUTFactory(unittest.TestCase):

    def setUp(self):
        self.app = makerequest(Zope2.app())
        # Make a manager user
        uf = self.app.acl_users
        uf._doAddUser('manager', 'secret', ['Manager'], [])
        # Make a folder to put stuff into
        self.app.manage_addFolder('folder', '')
        self.folder = self.app.folder
        # Setup VHM
        if 'virtual_hosting' not in self.app:
            vhm = VirtualHostMonster()
            vhm.addToContainer(self.app)
        # Fake a WebDAV PUT request
        request = self.app.REQUEST
        request['PARENTS'] = [self.app]
        request['BODY'] = 'bar'
        request['BODYFILE'] = b'bar'
        request.environ['CONTENT_TYPE'] = 'text/plain'
        request.environ['REQUEST_METHOD'] = 'PUT'
        request.environ['WEBDAV_SOURCE_PORT'] = 1
        request._auth = auth_info

    def tearDown(self):
        transaction.abort()
        self.app.REQUEST.close()
        self.app._p_jar.close()

    def testNoVirtualHosting(self):
        request = self.app.REQUEST
        put = request.traverse('/folder/doc')
        put(request, request.RESPONSE)
        self.assertTrue('doc' in self.folder.objectIds())

    def testSimpleVirtualHosting(self):
        request = self.app.REQUEST
        put = request.traverse('/VirtualHostBase/http/foo.com:80/'
                               'VirtualHostRoot/folder/doc')
        put(request, request.RESPONSE)
        self.assertTrue('doc' in self.folder.objectIds())

    def testSubfolderVirtualHosting(self):
        request = self.app.REQUEST
        put = request.traverse('/VirtualHostBase/http/foo.com:80/'
                               'folder/VirtualHostRoot/doc')
        put(request, request.RESPONSE)
        self.assertTrue('doc' in self.folder.objectIds())

    def testInsideOutVirtualHosting(self):
        request = self.app.REQUEST
        put = request.traverse('/VirtualHostBase/http/foo.com:80/'
                               'VirtualHostRoot/_vh_foo/folder/doc')
        put(request, request.RESPONSE)
        self.assertTrue('doc' in self.folder.objectIds())

    def testSubfolderInsideOutVirtualHosting(self):
        request = self.app.REQUEST
        put = request.traverse('/VirtualHostBase/http/foo.com:80/'
                               'folder/VirtualHostRoot/_vh_foo/doc')
        put(request, request.RESPONSE)
        self.assertTrue('doc' in self.folder.objectIds())

    def testCollector2261(self):
        from OFS.DTMLMethod import addDTMLMethod

        self.app.manage_addFolder('A', '')
        addDTMLMethod(self.app, 'a', file='I am file a')
        self.app.A.manage_addFolder('B', '')
        request = self.app.REQUEST
        # this should create 'a' within /A/B containing 'bar'
        put = request.traverse('/A/B/a')
        put(request, request.RESPONSE)
        # PUT should no acquire A.a
        self.assertEqual(str(self.app.A.a), 'I am file a',
                         'PUT factory should not acquire content')
        # check for the newly created file
        self.assertEqual(str(self.app.A.B.a), 'bar')

1	import base64	4✔
2	import unittest	4✔
3
4	import transaction	4✔
5	import Zope2	4✔
6	from Products.SiteAccess.VirtualHostMonster import VirtualHostMonster	4✔
7	from Testing.makerequest import makerequest	4✔
8
9
10	auth_info = b'Basic %s' % base64.encodebytes(b'manager:secret').rstrip()	4✔
11
12	Zope2.startup_wsgi()	4✔
13
14
15	class TestPUTFactory(unittest.TestCase):	4✔
16
17	def setUp(self):	4✔
18	self.app = makerequest(Zope2.app())	4✔
19	# Make a manager user
20	uf = self.app.acl_users	4✔
21	uf._doAddUser('manager', 'secret', ['Manager'], [])	4✔
22	# Make a folder to put stuff into
23	self.app.manage_addFolder('folder', '')	4✔
24	self.folder = self.app.folder	4✔
25	# Setup VHM
26	if 'virtual_hosting' not in self.app:	4!
27	vhm = VirtualHostMonster()	×
28	vhm.addToContainer(self.app)	×
29	# Fake a WebDAV PUT request
30	request = self.app.REQUEST	4✔
31	request['PARENTS'] = [self.app]	4✔
32	request['BODY'] = 'bar'	4✔
33	request['BODYFILE'] = b'bar'	4✔
34	request.environ['CONTENT_TYPE'] = 'text/plain'	4✔
35	request.environ['REQUEST_METHOD'] = 'PUT'	4✔
36	request.environ['WEBDAV_SOURCE_PORT'] = 1	4✔
37	request._auth = auth_info	4✔
38
39	def tearDown(self):	4✔
40	transaction.abort()	4✔
41	self.app.REQUEST.close()	4✔
42	self.app._p_jar.close()	4✔
43
44	def testNoVirtualHosting(self):	4✔
45	request = self.app.REQUEST	4✔
46	put = request.traverse('/folder/doc')	4✔
47	put(request, request.RESPONSE)	4✔
48	self.assertTrue('doc' in self.folder.objectIds())	4✔
49
50	def testSimpleVirtualHosting(self):	4✔
51	request = self.app.REQUEST	4✔
52	put = request.traverse('/VirtualHostBase/http/foo.com:80/'	4✔
53	'VirtualHostRoot/folder/doc')
54	put(request, request.RESPONSE)	4✔
55	self.assertTrue('doc' in self.folder.objectIds())	4✔
56
57	def testSubfolderVirtualHosting(self):	4✔
58	request = self.app.REQUEST	4✔
59	put = request.traverse('/VirtualHostBase/http/foo.com:80/'	4✔
60	'folder/VirtualHostRoot/doc')
61	put(request, request.RESPONSE)	4✔
62	self.assertTrue('doc' in self.folder.objectIds())	4✔
63
64	def testInsideOutVirtualHosting(self):	4✔
65	request = self.app.REQUEST	4✔
66	put = request.traverse('/VirtualHostBase/http/foo.com:80/'	4✔
67	'VirtualHostRoot/_vh_foo/folder/doc')
68	put(request, request.RESPONSE)	4✔
69	self.assertTrue('doc' in self.folder.objectIds())	4✔
70
71	def testSubfolderInsideOutVirtualHosting(self):	4✔
72	request = self.app.REQUEST	4✔
73	put = request.traverse('/VirtualHostBase/http/foo.com:80/'	4✔
74	'folder/VirtualHostRoot/_vh_foo/doc')
75	put(request, request.RESPONSE)	4✔
76	self.assertTrue('doc' in self.folder.objectIds())	4✔
77
78	def testCollector2261(self):	4✔
79	from OFS.DTMLMethod import addDTMLMethod	4✔
80
81	self.app.manage_addFolder('A', '')	4✔
82	addDTMLMethod(self.app, 'a', file='I am file a')	4✔
83	self.app.A.manage_addFolder('B', '')	4✔
84	request = self.app.REQUEST	4✔
85	# this should create 'a' within /A/B containing 'bar'
86	put = request.traverse('/A/B/a')	4✔
87	put(request, request.RESPONSE)	4✔
88	# PUT should no acquire A.a
89	self.assertEqual(str(self.app.A.a), 'I am file a',	4✔
90	'PUT factory should not acquire content')
91	# check for the newly created file
92	self.assertEqual(str(self.app.A.B.a), 'bar')	4✔

zopefoundation / Zope / 3555

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous