/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: 2009-01-30 00:49:41 UTC
  • mto: (3982.1.1 bzr.integration)
  • mto: This revision was merged to the branch mainline in revision 3983.
  • Revision ID: v.ladeuil+lp@free.fr-20090130004941-820fpd2ryyo127vv
Add more tests, fix pycurl double handling, revert previous tracking.

* bzrlib/tests/test_http.py:
(PredefinedRequestHandler): Renamed from
PreRecordedRequestHandler.
(PredefinedRequestHandler.handle_one_request): Get the canned
response from the test server directly.
(ActivityServerMixin): Make it a true object and intialize the
attributes in the constructor. Tests can now set the
canned_response attribute before querying the server.
(TestActivity.setUp, TestActivity.tearDown,
TestActivity.get_transport, TestActivity.assertActivitiesMatch):
Extracted from test_get to be able to write other tests.
(TestActivity.test_has, TestActivity.test_readv,
TestActivity.test_post): New tests, all cases should be covered
now.

* bzrlib/transport/http/response.py:
(RangeFile.__init__, RangeFile.read, handle_response): Revert
previous tracking, both http implementations can now report
activity from the socket.

* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._get_ranged, PyCurlTransport._post): Revert
previous tracking.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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 + '/', )