/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/treebuilder.py

  • Committer: v.ladeuil+lp at free
  • Date: 2006-12-11 13:24:55 UTC
  • mto: (2182.1.1 Aaron's integration)
  • mto: This revision was merged to the branch mainline in revision 2183.
  • Revision ID: v.ladeuil+lp@free.fr-20061211132455-e8k81db8ktfwvrlz
Tests for proxies, covering  #74759.

* bzrlib/transport/http/_urllib2_wrappers.py:
(ProxyHandler.proxy_bypass): Matches against the modified regexp,
not the original domain.

* bzrlib/tests/test_http.py:
(TestProxyHttpServer, TestProxyHttpServer_urllib,
TestProxyHttpServer_pycurl): New classes for proxy tests.

* bzrlib/tests/HttpServer.py:
(HttpServer._http_start): Give access to the port used by the
server socket.
(HttpServer.setUp, HttpServer.tearDown): Handles the 'no_proxy'
env var too.

* bzrlib/tests/HTTPTestUtil.py:
(TestCaseWithTwoWebservers): New class for tests needing two
related web servers.
(FakeProxyRequestHandler): New class to fake a proxy http server.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/treebuilder.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
"""TreeBuilder helper class.
18
18
 
19
 
TreeBuilders are used to build trees of various shapres or properties. This
 
19
TreeBuilders are used to build trees of various shapres or properties. This 
20
20
can be extremely useful in testing for instance.
21
21
"""
22
22
 
45
45
            self._tree.add('', 'root-id', 'directory')
46
46
            self._root_done = True
47
47
        for name in recipe:
 
48
            assert isinstance(name, basestring)
48
49
            if name[-1] == '/':
49
50
                self._tree.mkdir(name[:-1])
50
51
            else:
58
59
        """Raise NotBuilding if there is no current tree being built."""
59
60
        if self._tree is None:
60
61
            raise errors.NotBuilding
61
 
 
 
62
            
62
63
    def finish_tree(self):
63
64
        """Finish building the current tree."""
64
65
        self._ensure_building()
68
69
 
69
70
    def start_tree(self, tree):
70
71
        """Start building on tree.
71
 
 
72
 
        :param tree: A tree to start building on. It must provide the
 
72
        
 
73
        :param tree: A tree to start building on. It must provide the 
73
74
            MutableTree interface.
74
75
        """
75
76
        if self._tree is not None: