/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/treeshape.py

  • Committer: Vincent Ladeuil
  • Date: 2007-03-14 16:39:24 UTC
  • mto: (2323.7.1 redirection)
  • mto: This revision was merged to the branch mainline in revision 2390.
  • Revision ID: v.ladeuil+lp@free.fr-20070314163924-5xoey9mkxe6qaptd
Test the http redirection at the request level even if it's not
used anymore, so far.

* bzrlib/transport/http/_urllib2_wrappers.py
(HTTPRedirectHandler.http_error_302): Renamed from http_error_30x.
(HTTPRedirectHandler.http_error_301): Deleted. Finally, that's the
easiest way to fix bug #88780 :) In retrospect, that code was a
first attempt to handle this whole redirection handling by
providing the final target to the first request. This is not
needed anymore.

* bzrlib/tests/test_http.py:
(RedirectedRequest, TestHTTPSilentRedirections_urllib): Test the
_urllib2_wrappers redirection at the request level.

* bzrlib/tests/HTTPTestUtil.py:
(RedirectRequestHandler.parse_request): Delegate the redirection
handling to the test_case_server.
(HTTPServerRedirecting.is_redirected): Handle redirections by
searching a matching directive.
(HTTPServerRedirecting.redirect_to): Redefined to use the nre
redirections definitions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/treeshape.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
18
"""Test helper for constructing and testing directories.
19
19
 
20
 
This module transforms filesystem directories to and from Python lists.
 
20
This module transforms filesystem directories to and from Python lists.  
21
21
As a Python list the descriptions can be stored in test cases, compared,
22
22
etc.
23
23
"""
24
24
 
25
25
# TODO: Script to write a description of a directory for testing
26
26
# TODO: Helper that compares two structures and raises a helpful error
27
 
# where they differ.  Option to ignore some files or directories in the
 
27
# where they differ.  Option to ignore some files or directories in the 
28
28
# comparison.
29
29
 
30
30
import os
58
58
 
59
59
def capture_tree_contents(top):
60
60
    """Make a Python datastructure description of a tree.
61
 
 
 
61
    
62
62
    If top is an absolute path the descriptions will be absolute."""
63
63
    for dirpath, dirnames, filenames in os.walk(top):
64
64
        yield (dirpath + '/', )
65
65
        filenames.sort()
66
66
        for fn in filenames:
67
67
            fullpath = pathjoin(dirpath, fn)
68
 
            if (fullpath[-1] in '@/'):
69
 
                raise AssertionError(fullpath)
 
68
            assert not (fullpath[-1] in '@/')
70
69
            info = os.lstat(fullpath)
71
70
            if stat.S_ISLNK(info.st_mode):
72
71
                yield (fullpath + '@', os.readlink(fullpath))