← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_http.py

  • Committer: John Arbash Meinel
  • Date: 2006-02-21 16:43:22 UTC
  • mfrom: (1560 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1562.
  • Revision ID: john@arbash-meinel.com-20060221164322-b007aa882582a66e
[merge] bzr.dev, cleanup conflicts, fixup http tests for new TestCase layout.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_http.py
62
62
        self.build_tree(['xxx', 'foo/', 'foo/bar'], line_endings='binary')
63
63
 
64
64
    def test_http_has(self):
65
 
        t = HttpTransport(self.server.get_url())
 
65
        server = self.get_readonly_server()
 
66
        t = HttpTransport(server.get_url())
66
67
        self.assertEqual(t.has('foo/bar'), True)
67
 
        self.assertEqual(len(self.server.logs), 1)
68
 
        self.assertTrue(self.server.logs[0].endswith(
 
68
        self.assertEqual(len(server.logs), 1)
 
69
        self.assertTrue(server.logs[0].endswith(
69
70
            '"HEAD /foo/bar HTTP/1.1" 200 - "-" "bzr/%s"'
70
71
            % bzrlib.__version__))
71
72
 
72
73
        self.assertEqual(t.has('not-found'), False)
73
 
        self.assertTrue(self.server.logs[-1].endswith(
 
74
        self.assertTrue(server.logs[-1].endswith(
74
75
            '"HEAD /not-found HTTP/1.1" 404 - "-" "bzr/%s"'
75
76
            % bzrlib.__version__))
76
77
 
77
78
    def test_http_get(self):
78
 
        t = HttpTransport(self.server.get_url())
 
79
        server = self.get_readonly_server()
 
80
        t = HttpTransport(server.get_url())
79
81
        fp = t.get('foo/bar')
80
82
        self.assertEqualDiff(
81
83
            fp.read(),
82
84
            'contents of foo/bar\n')
83
 
        self.assertEqual(len(self.server.logs), 1)
84
 
        self.assertTrue(self.server.logs[0].endswith(
 
85
        self.assertEqual(len(server.logs), 1)
 
86
        self.assertTrue(server.logs[0].endswith(
85
87
            '"GET /foo/bar HTTP/1.1" 200 - "-" "bzr/%s"' % bzrlib.__version__))