| Status: | Merged |
|---|---|
| Approved by: | Vincent Ladeuil |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 5326 |
| Proposed branch: | lp:~vila/bzr/cleanup |
| Merge into: | lp:bzr |
| Diff against target: |
3505 lines (+653/-611) 72 files modified
bzrlib/_annotator_py.py (+1/-1) bzrlib/add.py (+1/-1) bzrlib/annotate.py (+1/-1) bzrlib/benchmarks/bench_commit.py (+1/-2) bzrlib/breakin.py (+1/-1) bzrlib/btree_index.py (+3/-2) bzrlib/builtins.py (+4/-4) bzrlib/filters/eol.py (+1/-1) bzrlib/osutils.py (+23/-29) bzrlib/plugins/launchpad/account.py (+7/-4) bzrlib/plugins/launchpad/test_lp_directory.py (+3/-3) bzrlib/symbol_versioning.py (+1/-1) bzrlib/tests/__init__.py (+25/-21) bzrlib/tests/blackbox/__init__.py (+1/-1) bzrlib/tests/blackbox/test_alias.py (+1/-1) bzrlib/tests/blackbox/test_aliases.py (+1/-1) bzrlib/tests/blackbox/test_cat_revision.py (+1/-1) bzrlib/tests/blackbox/test_check.py (+1/-1) bzrlib/tests/blackbox/test_dpush.py (+1/-1) bzrlib/tests/blackbox/test_filesystem_cicp.py (+1/-1) bzrlib/tests/blackbox/test_find_merge_base.py (+1/-1) bzrlib/tests/blackbox/test_ignored.py (+1/-1) bzrlib/tests/blackbox/test_merge_directive.py (+1/-1) bzrlib/tests/blackbox/test_missing.py (+1/-1) bzrlib/tests/blackbox/test_modified.py (+1/-1) bzrlib/tests/blackbox/test_nick.py (+1/-1) bzrlib/tests/blackbox/test_remove.py (+1/-1) bzrlib/tests/blackbox/test_remove_tree.py (+1/-1) bzrlib/tests/blackbox/test_revert.py (+1/-1) bzrlib/tests/blackbox/test_revision_info.py (+1/-1) bzrlib/tests/blackbox/test_serve.py (+4/-3) bzrlib/tests/blackbox/test_upgrade.py (+10/-9) bzrlib/tests/blackbox/test_whoami.py (+1/-1) bzrlib/tests/http_utils.py (+14/-2) bzrlib/tests/per_branch/test_bound_sftp.py (+2/-2) bzrlib/tests/per_branch/test_permissions.py (+1/-2) bzrlib/tests/per_branch/test_stacking.py (+1/-2) bzrlib/tests/per_bzrdir/test_bzrdir.py (+20/-21) bzrlib/tests/per_interbranch/__init__.py (+1/-2) bzrlib/tests/per_interbranch/test_pull.py (+1/-1) bzrlib/tests/per_interbranch/test_push.py (+0/-1) bzrlib/tests/per_interbranch/test_update_revisions.py (+1/-1) bzrlib/tests/per_interrepository/__init__.py (+3/-3) bzrlib/tests/per_intertree/__init__.py (+0/-1) bzrlib/tests/per_repository/test_fetch.py (+1/-2) bzrlib/tests/per_repository/test_has_same_location.py (+7/-4) bzrlib/tests/per_repository/test_reconcile.py (+10/-7) bzrlib/tests/per_versionedfile.py (+21/-16) bzrlib/tests/per_workingtree/test_pull.py (+0/-1) bzrlib/tests/test_btree_index.py (+106/-105) bzrlib/tests/test_bzrdir.py (+2/-0) bzrlib/tests/test_debug.py (+8/-7) bzrlib/tests/test_directory_service.py (+2/-2) bzrlib/tests/test_http.py (+15/-6) bzrlib/tests/test_index.py (+245/-234) bzrlib/tests/test_knit.py (+3/-3) bzrlib/tests/test_lockable_files.py (+6/-6) bzrlib/tests/test_osutils.py (+1/-1) bzrlib/tests/test_osutils_encodings.py (+1/-1) bzrlib/tests/test_permissions.py (+5/-5) bzrlib/tests/test_reconcile.py (+8/-5) bzrlib/tests/test_remote.py (+4/-4) bzrlib/tests/test_selftest.py (+5/-8) bzrlib/tests/test_sftp_transport.py (+4/-5) bzrlib/tests/test_smart_request.py (+9/-7) bzrlib/tests/test_transport_log.py (+3/-3) bzrlib/tests/test_upgrade.py (+26/-26) bzrlib/tests/test_workingtree.py (+2/-2) bzrlib/textmerge.py (+1/-1) bzrlib/transport/decorator.py (+5/-5) bzrlib/transport/remote.py (+1/-1) bzrlib/workingtree.py (+4/-5) |
| To merge this branch: | bzr merge lp:~vila/bzr/cleanup |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| John A Meinel | Needs Fixing | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2010-06-23.
Commit message
Cleanup tests importing get_transport.
Description of the change
This patch cleans a bunch of import in tests.
Most of them focus on get_transport being imported as a symbol which makes it impossible to wrap.
To post a comment you must log in.
Revision history for this message
| Vincent Ladeuil (vila) wrote : Posted in a previous version of this proposal | # |
Revision history for this message
| John A Meinel (jameinel) wrote : | # |
There is a small regression in osutils, in that it will force-loading of 'shutil' always, rather than only when someone calls 'shutil.rmtree'.
I also have some gripes about test_http being hard to understand (it made it difficult to understand why this patch was ok). However I filed a bug on that (bug #597791) and doesn't need to block this patch.
So 'tweak', and land with a small fix to osutils.
review:
Needs Fixing
Revision history for this message
| John A Meinel (jameinel) wrote : | # |
Marking as WIP for feed-pqm's sake. I'm not entirely happy with that status, because I'd really like to keep it more alive than WIP. (We tend to forget it exists once it is in WIP because it doesn't show up on the main page.)
Revision history for this message
| Vincent Ladeuil (vila) wrote : | # |
sent to pqm by email
Revision history for this message
| Vincent Ladeuil (vila) wrote : | # |
sent to pqm by email
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'bzrlib/_annotator_py.py' | |||
| 2 | --- bzrlib/_annotator_py.py 2010-06-04 03:09:35 +0000 | |||
| 3 | +++ bzrlib/_annotator_py.py 2010-06-29 17:48:31 +0000 | |||
| 4 | @@ -1,4 +1,4 @@ | |||
| 6 | 1 | # Copyright (C) 2009 Canonical Ltd | 1 | # Copyright (C) 2009, 2010 Canonical Ltd |
| 7 | 2 | # | 2 | # |
| 8 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 9 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 10 | 5 | 5 | ||
| 11 | === modified file 'bzrlib/add.py' | |||
| 12 | --- bzrlib/add.py 2010-06-21 21:50:57 +0000 | |||
| 13 | +++ bzrlib/add.py 2010-06-29 17:48:31 +0000 | |||
| 14 | @@ -1,4 +1,4 @@ | |||
| 16 | 1 | # Copyright (C) 2005, 2006 Canonical Ltd | 1 | # Copyright (C) 2005-2010 Canonical Ltd |
| 17 | 2 | # | 2 | # |
| 18 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 19 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 20 | 5 | 5 | ||
| 21 | === modified file 'bzrlib/annotate.py' | |||
| 22 | --- bzrlib/annotate.py 2010-06-04 03:09:35 +0000 | |||
| 23 | +++ bzrlib/annotate.py 2010-06-29 17:48:31 +0000 | |||
| 24 | @@ -1,4 +1,4 @@ | |||
| 26 | 1 | # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Canonical Ltd | 1 | # Copyright (C) 2005-2010 Canonical Ltd |
| 27 | 2 | # | 2 | # |
| 28 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 29 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 30 | 5 | 5 | ||
| 31 | === modified file 'bzrlib/benchmarks/bench_commit.py' | |||
| 32 | --- bzrlib/benchmarks/bench_commit.py 2009-03-23 14:59:43 +0000 | |||
| 33 | +++ bzrlib/benchmarks/bench_commit.py 2010-06-29 17:48:31 +0000 | |||
| 34 | @@ -1,4 +1,4 @@ | |||
| 36 | 1 | # Copyright (C) 2006 Canonical Ltd | 1 | # Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd |
| 37 | 2 | # | 2 | # |
| 38 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 39 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 40 | @@ -20,7 +20,6 @@ | |||
| 41 | 20 | 20 | ||
| 42 | 21 | from bzrlib.benchmarks import Benchmark | 21 | from bzrlib.benchmarks import Benchmark |
| 43 | 22 | from bzrlib.transport.memory import MemoryServer | 22 | from bzrlib.transport.memory import MemoryServer |
| 44 | 23 | from bzrlib.transport import get_transport | ||
| 45 | 24 | 23 | ||
| 46 | 25 | 24 | ||
| 47 | 26 | class CommitBenchmark(Benchmark): | 25 | class CommitBenchmark(Benchmark): |
| 48 | 27 | 26 | ||
| 49 | === modified file 'bzrlib/breakin.py' | |||
| 50 | --- bzrlib/breakin.py 2010-06-02 04:50:35 +0000 | |||
| 51 | +++ bzrlib/breakin.py 2010-06-29 17:48:31 +0000 | |||
| 52 | @@ -1,4 +1,4 @@ | |||
| 54 | 1 | # Copyright (C) 2006, 2007, 2009 Canonical Ltd | 1 | # Copyright (C) 2007, 2009, 2010 Canonical Ltd |
| 55 | 2 | # | 2 | # |
| 56 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 57 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 58 | 5 | 5 | ||
| 59 | === modified file 'bzrlib/btree_index.py' | |||
| 60 | --- bzrlib/btree_index.py 2010-03-25 12:32:24 +0000 | |||
| 61 | +++ bzrlib/btree_index.py 2010-06-29 17:48:31 +0000 | |||
| 62 | @@ -33,9 +33,9 @@ | |||
| 63 | 33 | osutils, | 33 | osutils, |
| 64 | 34 | static_tuple, | 34 | static_tuple, |
| 65 | 35 | trace, | 35 | trace, |
| 66 | 36 | transport, | ||
| 67 | 36 | ) | 37 | ) |
| 68 | 37 | from bzrlib.index import _OPTION_NODE_REFS, _OPTION_KEY_ELEMENTS, _OPTION_LEN | 38 | from bzrlib.index import _OPTION_NODE_REFS, _OPTION_KEY_ELEMENTS, _OPTION_LEN |
| 69 | 38 | from bzrlib.transport import get_transport | ||
| 70 | 39 | 39 | ||
| 71 | 40 | 40 | ||
| 72 | 41 | _BTSIGNATURE = "B+Tree Graph Index 2\n" | 41 | _BTSIGNATURE = "B+Tree Graph Index 2\n" |
| 73 | @@ -193,7 +193,8 @@ | |||
| 74 | 193 | new_backing_file, size = self._spill_mem_keys_without_combining() | 193 | new_backing_file, size = self._spill_mem_keys_without_combining() |
| 75 | 194 | # Note: The transport here isn't strictly needed, because we will use | 194 | # Note: The transport here isn't strictly needed, because we will use |
| 76 | 195 | # direct access to the new_backing._file object | 195 | # direct access to the new_backing._file object |
| 78 | 196 | new_backing = BTreeGraphIndex(get_transport('.'), '<temp>', size) | 196 | new_backing = BTreeGraphIndex(transport.get_transport('.'), |
| 79 | 197 | '<temp>', size) | ||
| 80 | 197 | # GC will clean up the file | 198 | # GC will clean up the file |
| 81 | 198 | new_backing._file = new_backing_file | 199 | new_backing._file = new_backing_file |
| 82 | 199 | if self._combine_backing_indices: | 200 | if self._combine_backing_indices: |
| 83 | 200 | 201 | ||
| 84 | === modified file 'bzrlib/builtins.py' | |||
| 85 | --- bzrlib/builtins.py 2010-06-17 08:53:15 +0000 | |||
| 86 | +++ bzrlib/builtins.py 2010-06-29 17:48:31 +0000 | |||
| 87 | @@ -4920,17 +4920,17 @@ | |||
| 88 | 4920 | 4920 | ||
| 89 | 4921 | def run(self, port=None, inet=False, directory=None, allow_writes=False, | 4921 | def run(self, port=None, inet=False, directory=None, allow_writes=False, |
| 90 | 4922 | protocol=None): | 4922 | protocol=None): |
| 92 | 4923 | from bzrlib.transport import get_transport, transport_server_registry | 4923 | from bzrlib import transport |
| 93 | 4924 | if directory is None: | 4924 | if directory is None: |
| 94 | 4925 | directory = os.getcwd() | 4925 | directory = os.getcwd() |
| 95 | 4926 | if protocol is None: | 4926 | if protocol is None: |
| 97 | 4927 | protocol = transport_server_registry.get() | 4927 | protocol = transport.transport_server_registry.get() |
| 98 | 4928 | host, port = self.get_host_and_port(port) | 4928 | host, port = self.get_host_and_port(port) |
| 99 | 4929 | url = urlutils.local_path_to_url(directory) | 4929 | url = urlutils.local_path_to_url(directory) |
| 100 | 4930 | if not allow_writes: | 4930 | if not allow_writes: |
| 101 | 4931 | url = 'readonly+' + url | 4931 | url = 'readonly+' + url |
| 104 | 4932 | transport = get_transport(url) | 4932 | t = transport.get_transport(url) |
| 105 | 4933 | protocol(transport, host, port, inet) | 4933 | protocol(t, host, port, inet) |
| 106 | 4934 | 4934 | ||
| 107 | 4935 | 4935 | ||
| 108 | 4936 | class cmd_join(Command): | 4936 | class cmd_join(Command): |
| 109 | 4937 | 4937 | ||
| 110 | === modified file 'bzrlib/filters/eol.py' | |||
| 111 | --- bzrlib/filters/eol.py 2010-06-02 04:56:07 +0000 | |||
| 112 | +++ bzrlib/filters/eol.py 2010-06-29 17:48:31 +0000 | |||
| 113 | @@ -1,4 +1,4 @@ | |||
| 115 | 1 | # Copyright (C) 2009 Canonical Ltd | 1 | # Copyright (C) 2009, 2010 Canonical Ltd |
| 116 | 2 | # | 2 | # |
| 117 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 118 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 119 | 5 | 5 | ||
| 120 | === modified file 'bzrlib/osutils.py' | |||
| 121 | --- bzrlib/osutils.py 2010-06-25 20:34:05 +0000 | |||
| 122 | +++ bzrlib/osutils.py 2010-06-29 17:48:31 +0000 | |||
| 123 | @@ -18,7 +18,6 @@ | |||
| 124 | 18 | import os | 18 | import os |
| 125 | 19 | import re | 19 | import re |
| 126 | 20 | import stat | 20 | import stat |
| 127 | 21 | from stat import S_ISREG, S_ISDIR, S_ISLNK, ST_MODE, ST_SIZE | ||
| 128 | 22 | import sys | 21 | import sys |
| 129 | 23 | import time | 22 | import time |
| 130 | 24 | import codecs | 23 | import codecs |
| 131 | @@ -27,23 +26,18 @@ | |||
| 132 | 27 | lazy_import(globals(), """ | 26 | lazy_import(globals(), """ |
| 133 | 28 | from datetime import datetime | 27 | from datetime import datetime |
| 134 | 29 | import getpass | 28 | import getpass |
| 141 | 30 | from ntpath import (abspath as _nt_abspath, | 29 | import ntpath |
| 136 | 31 | join as _nt_join, | ||
| 137 | 32 | normpath as _nt_normpath, | ||
| 138 | 33 | realpath as _nt_realpath, | ||
| 139 | 34 | splitdrive as _nt_splitdrive, | ||
| 140 | 35 | ) | ||
| 142 | 36 | import posixpath | 30 | import posixpath |
| 143 | 31 | # We need to import both shutil and rmtree as we export the later on posix | ||
| 144 | 32 | # and need the former on windows | ||
| 145 | 37 | import shutil | 33 | import shutil |
| 149 | 38 | from shutil import ( | 34 | from shutil import rmtree |
| 147 | 39 | rmtree, | ||
| 148 | 40 | ) | ||
| 150 | 41 | import socket | 35 | import socket |
| 151 | 42 | import subprocess | 36 | import subprocess |
| 152 | 37 | # We need to import both tempfile and mkdtemp as we export the later on posix | ||
| 153 | 38 | # and need the former on windows | ||
| 154 | 43 | import tempfile | 39 | import tempfile |
| 158 | 44 | from tempfile import ( | 40 | from tempfile import mkdtemp |
| 156 | 45 | mkdtemp, | ||
| 157 | 46 | ) | ||
| 159 | 47 | import unicodedata | 41 | import unicodedata |
| 160 | 48 | 42 | ||
| 161 | 49 | from bzrlib import ( | 43 | from bzrlib import ( |
| 162 | @@ -304,13 +298,13 @@ | |||
| 163 | 304 | running python.exe under cmd.exe return capital C:\\ | 298 | running python.exe under cmd.exe return capital C:\\ |
| 164 | 305 | running win32 python inside a cygwin shell returns lowercase c:\\ | 299 | running win32 python inside a cygwin shell returns lowercase c:\\ |
| 165 | 306 | """ | 300 | """ |
| 167 | 307 | drive, path = _nt_splitdrive(path) | 301 | drive, path = ntpath.splitdrive(path) |
| 168 | 308 | return drive.upper() + path | 302 | return drive.upper() + path |
| 169 | 309 | 303 | ||
| 170 | 310 | 304 | ||
| 171 | 311 | def _win32_abspath(path): | 305 | def _win32_abspath(path): |
| 174 | 312 | # Real _nt_abspath doesn't have a problem with a unicode cwd | 306 | # Real ntpath.abspath doesn't have a problem with a unicode cwd |
| 175 | 313 | return _win32_fixdrive(_nt_abspath(unicode(path)).replace('\\', '/')) | 307 | return _win32_fixdrive(ntpath.abspath(unicode(path)).replace('\\', '/')) |
| 176 | 314 | 308 | ||
| 177 | 315 | 309 | ||
| 178 | 316 | def _win98_abspath(path): | 310 | def _win98_abspath(path): |
| 179 | @@ -327,30 +321,30 @@ | |||
| 180 | 327 | # /path => C:/path | 321 | # /path => C:/path |
| 181 | 328 | path = unicode(path) | 322 | path = unicode(path) |
| 182 | 329 | # check for absolute path | 323 | # check for absolute path |
| 184 | 330 | drive = _nt_splitdrive(path)[0] | 324 | drive = ntpath.splitdrive(path)[0] |
| 185 | 331 | if drive == '' and path[:2] not in('//','\\\\'): | 325 | if drive == '' and path[:2] not in('//','\\\\'): |
| 186 | 332 | cwd = os.getcwdu() | 326 | cwd = os.getcwdu() |
| 187 | 333 | # we cannot simply os.path.join cwd and path | 327 | # we cannot simply os.path.join cwd and path |
| 188 | 334 | # because os.path.join('C:','/path') produce '/path' | 328 | # because os.path.join('C:','/path') produce '/path' |
| 189 | 335 | # and this is incorrect | 329 | # and this is incorrect |
| 190 | 336 | if path[:1] in ('/','\\'): | 330 | if path[:1] in ('/','\\'): |
| 192 | 337 | cwd = _nt_splitdrive(cwd)[0] | 331 | cwd = ntpath.splitdrive(cwd)[0] |
| 193 | 338 | path = path[1:] | 332 | path = path[1:] |
| 194 | 339 | path = cwd + '\\' + path | 333 | path = cwd + '\\' + path |
| 196 | 340 | return _win32_fixdrive(_nt_normpath(path).replace('\\', '/')) | 334 | return _win32_fixdrive(ntpath.normpath(path).replace('\\', '/')) |
| 197 | 341 | 335 | ||
| 198 | 342 | 336 | ||
| 199 | 343 | def _win32_realpath(path): | 337 | def _win32_realpath(path): |
| 202 | 344 | # Real _nt_realpath doesn't have a problem with a unicode cwd | 338 | # Real ntpath.realpath doesn't have a problem with a unicode cwd |
| 203 | 345 | return _win32_fixdrive(_nt_realpath(unicode(path)).replace('\\', '/')) | 339 | return _win32_fixdrive(ntpath.realpath(unicode(path)).replace('\\', '/')) |
| 204 | 346 | 340 | ||
| 205 | 347 | 341 | ||
| 206 | 348 | def _win32_pathjoin(*args): | 342 | def _win32_pathjoin(*args): |
| 208 | 349 | return _nt_join(*args).replace('\\', '/') | 343 | return ntpath.join(*args).replace('\\', '/') |
| 209 | 350 | 344 | ||
| 210 | 351 | 345 | ||
| 211 | 352 | def _win32_normpath(path): | 346 | def _win32_normpath(path): |
| 213 | 353 | return _win32_fixdrive(_nt_normpath(unicode(path)).replace('\\', '/')) | 347 | return _win32_fixdrive(ntpath.normpath(unicode(path)).replace('\\', '/')) |
| 214 | 354 | 348 | ||
| 215 | 355 | 349 | ||
| 216 | 356 | def _win32_getcwd(): | 350 | def _win32_getcwd(): |
| 217 | @@ -358,7 +352,7 @@ | |||
| 218 | 358 | 352 | ||
| 219 | 359 | 353 | ||
| 220 | 360 | def _win32_mkdtemp(*args, **kwargs): | 354 | def _win32_mkdtemp(*args, **kwargs): |
| 222 | 361 | return _win32_fixdrive(tempfile.mkdtemp(*args, **kwargs).replace('\\', '/')) | 355 | return _win32_fixdrive(mkdtemp(*args, **kwargs).replace('\\', '/')) |
| 223 | 362 | 356 | ||
| 224 | 363 | 357 | ||
| 225 | 364 | def _win32_rename(old, new): | 358 | def _win32_rename(old, new): |
| 226 | @@ -395,7 +389,7 @@ | |||
| 227 | 395 | basename = os.path.basename | 389 | basename = os.path.basename |
| 228 | 396 | split = os.path.split | 390 | split = os.path.split |
| 229 | 397 | splitext = os.path.splitext | 391 | splitext = os.path.splitext |
| 231 | 398 | # These were already imported into local scope | 392 | # These were already lazily imported into local scope |
| 232 | 399 | # mkdtemp = tempfile.mkdtemp | 393 | # mkdtemp = tempfile.mkdtemp |
| 233 | 400 | # rmtree = shutil.rmtree | 394 | # rmtree = shutil.rmtree |
| 234 | 401 | 395 | ||
| 235 | @@ -509,7 +503,7 @@ | |||
| 236 | 509 | def isdir(f): | 503 | def isdir(f): |
| 237 | 510 | """True if f is an accessible directory.""" | 504 | """True if f is an accessible directory.""" |
| 238 | 511 | try: | 505 | try: |
| 240 | 512 | return S_ISDIR(os.lstat(f)[ST_MODE]) | 506 | return stat.S_ISDIR(os.lstat(f)[stat.ST_MODE]) |
| 241 | 513 | except OSError: | 507 | except OSError: |
| 242 | 514 | return False | 508 | return False |
| 243 | 515 | 509 | ||
| 244 | @@ -517,14 +511,14 @@ | |||
| 245 | 517 | def isfile(f): | 511 | def isfile(f): |
| 246 | 518 | """True if f is a regular file.""" | 512 | """True if f is a regular file.""" |
| 247 | 519 | try: | 513 | try: |
| 249 | 520 | return S_ISREG(os.lstat(f)[ST_MODE]) | 514 | return stat.S_ISREG(os.lstat(f)[stat.ST_MODE]) |
| 250 | 521 | except OSError: | 515 | except OSError: |
| 251 | 522 | return False | 516 | return False |
| 252 | 523 | 517 | ||
| 253 | 524 | def islink(f): | 518 | def islink(f): |
| 254 | 525 | """True if f is a symlink.""" | 519 | """True if f is a symlink.""" |
| 255 | 526 | try: | 520 | try: |
| 257 | 527 | return S_ISLNK(os.lstat(f)[ST_MODE]) | 521 | return stat.S_ISLNK(os.lstat(f)[stat.ST_MODE]) |
| 258 | 528 | except OSError: | 522 | except OSError: |
| 259 | 529 | return False | 523 | return False |
| 260 | 530 | 524 | ||
| 261 | @@ -870,7 +864,7 @@ | |||
| 262 | 870 | 864 | ||
| 263 | 871 | def filesize(f): | 865 | def filesize(f): |
| 264 | 872 | """Return size of given open file.""" | 866 | """Return size of given open file.""" |
| 266 | 873 | return os.fstat(f.fileno())[ST_SIZE] | 867 | return os.fstat(f.fileno())[stat.ST_SIZE] |
| 267 | 874 | 868 | ||
| 268 | 875 | 869 | ||
| 269 | 876 | # Define rand_bytes based on platform. | 870 | # Define rand_bytes based on platform. |
| 270 | 877 | 871 | ||
| 271 | === modified file 'bzrlib/plugins/launchpad/account.py' | |||
| 272 | --- bzrlib/plugins/launchpad/account.py 2009-04-27 16:10:10 +0000 | |||
| 273 | +++ bzrlib/plugins/launchpad/account.py 2010-06-29 17:48:31 +0000 | |||
| 274 | @@ -1,4 +1,4 @@ | |||
| 276 | 1 | # Copyright (C) 2007, 2008 Canonical Ltd | 1 | # Copyright (C) 2007-2010 Canonical Ltd |
| 277 | 2 | # | 2 | # |
| 278 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 279 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 280 | @@ -20,9 +20,12 @@ | |||
| 281 | 20 | than once for each place that needs to take it into account. | 20 | than once for each place that needs to take it into account. |
| 282 | 21 | """ | 21 | """ |
| 283 | 22 | 22 | ||
| 285 | 23 | from bzrlib import errors, trace | 23 | from bzrlib import ( |
| 286 | 24 | errors, | ||
| 287 | 25 | trace, | ||
| 288 | 26 | transport, | ||
| 289 | 27 | ) | ||
| 290 | 24 | from bzrlib.config import AuthenticationConfig, GlobalConfig | 28 | from bzrlib.config import AuthenticationConfig, GlobalConfig |
| 291 | 25 | from bzrlib.transport import get_transport | ||
| 292 | 26 | 29 | ||
| 293 | 27 | 30 | ||
| 294 | 28 | LAUNCHPAD_BASE = 'https://launchpad.net/' | 31 | LAUNCHPAD_BASE = 'https://launchpad.net/' |
| 295 | @@ -97,7 +100,7 @@ | |||
| 296 | 97 | uploaded SSH keys. | 100 | uploaded SSH keys. |
| 297 | 98 | """ | 101 | """ |
| 298 | 99 | if _transport is None: | 102 | if _transport is None: |
| 300 | 100 | _transport = get_transport(LAUNCHPAD_BASE) | 103 | _transport = transport.get_transport(LAUNCHPAD_BASE) |
| 301 | 101 | 104 | ||
| 302 | 102 | try: | 105 | try: |
| 303 | 103 | data = _transport.get_bytes('~%s/+sshkeys' % username) | 106 | data = _transport.get_bytes('~%s/+sshkeys' % username) |
| 304 | 104 | 107 | ||
| 305 | === modified file 'bzrlib/plugins/launchpad/test_lp_directory.py' | |||
| 306 | --- bzrlib/plugins/launchpad/test_lp_directory.py 2010-05-20 18:23:10 +0000 | |||
| 307 | +++ bzrlib/plugins/launchpad/test_lp_directory.py 2010-06-29 17:48:31 +0000 | |||
| 308 | @@ -22,6 +22,7 @@ | |||
| 309 | 22 | from bzrlib import ( | 22 | from bzrlib import ( |
| 310 | 23 | errors, | 23 | errors, |
| 311 | 24 | tests, | 24 | tests, |
| 312 | 25 | transport, | ||
| 313 | 25 | ) | 26 | ) |
| 314 | 26 | from bzrlib.branch import Branch | 27 | from bzrlib.branch import Branch |
| 315 | 27 | from bzrlib.directory_service import directories | 28 | from bzrlib.directory_service import directories |
| 316 | @@ -29,7 +30,6 @@ | |||
| 317 | 29 | TestCaseInTempDir, | 30 | TestCaseInTempDir, |
| 318 | 30 | TestCaseWithMemoryTransport | 31 | TestCaseWithMemoryTransport |
| 319 | 31 | ) | 32 | ) |
| 320 | 32 | from bzrlib.transport import get_transport | ||
| 321 | 33 | from bzrlib.plugins.launchpad import ( | 33 | from bzrlib.plugins.launchpad import ( |
| 322 | 34 | _register_directory, | 34 | _register_directory, |
| 323 | 35 | lp_registration, | 35 | lp_registration, |
| 324 | @@ -217,8 +217,8 @@ | |||
| 325 | 217 | directories.register('lp:', FooService, 'Map lp URLs to local urls') | 217 | directories.register('lp:', FooService, 'Map lp URLs to local urls') |
| 326 | 218 | self.addCleanup(_register_directory) | 218 | self.addCleanup(_register_directory) |
| 327 | 219 | self.addCleanup(directories.remove, 'lp:') | 219 | self.addCleanup(directories.remove, 'lp:') |
| 330 | 220 | transport = get_transport('lp:///apt') | 220 | t = transport.get_transport('lp:///apt') |
| 331 | 221 | branch = Branch.open_from_transport(transport) | 221 | branch = Branch.open_from_transport(t) |
| 332 | 222 | self.assertEqual(target_branch.base, branch.base) | 222 | self.assertEqual(target_branch.base, branch.base) |
| 333 | 223 | 223 | ||
| 334 | 224 | 224 | ||
| 335 | 225 | 225 | ||
| 336 | === modified file 'bzrlib/symbol_versioning.py' | |||
| 337 | --- bzrlib/symbol_versioning.py 2010-06-25 06:11:21 +0000 | |||
| 338 | +++ bzrlib/symbol_versioning.py 2010-06-29 17:48:31 +0000 | |||
| 339 | @@ -1,4 +1,4 @@ | |||
| 341 | 1 | # Copyright (C) 2006, 2007, 2008, 2009 Canonical Ltd | 1 | # Copyright (C) 2006-2010 Canonical Ltd |
| 342 | 2 | # | 2 | # |
| 343 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 344 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 345 | 5 | 5 | ||
| 346 | === modified file 'bzrlib/tests/__init__.py' | |||
| 347 | --- bzrlib/tests/__init__.py 2010-06-25 06:12:56 +0000 | |||
| 348 | +++ bzrlib/tests/__init__.py 2010-06-29 17:48:31 +0000 | |||
| 349 | @@ -29,7 +29,7 @@ | |||
| 350 | 29 | 29 | ||
| 351 | 30 | import atexit | 30 | import atexit |
| 352 | 31 | import codecs | 31 | import codecs |
| 354 | 32 | from copy import copy | 32 | import copy |
| 355 | 33 | from cStringIO import StringIO | 33 | from cStringIO import StringIO |
| 356 | 34 | import difflib | 34 | import difflib |
| 357 | 35 | import doctest | 35 | import doctest |
| 358 | @@ -37,12 +37,12 @@ | |||
| 359 | 37 | import logging | 37 | import logging |
| 360 | 38 | import math | 38 | import math |
| 361 | 39 | import os | 39 | import os |
| 363 | 40 | from pprint import pformat | 40 | import pprint |
| 364 | 41 | import random | 41 | import random |
| 365 | 42 | import re | 42 | import re |
| 366 | 43 | import shlex | 43 | import shlex |
| 367 | 44 | import stat | 44 | import stat |
| 369 | 45 | from subprocess import Popen, PIPE, STDOUT | 45 | import subprocess |
| 370 | 46 | import sys | 46 | import sys |
| 371 | 47 | import tempfile | 47 | import tempfile |
| 372 | 48 | import threading | 48 | import threading |
| 373 | @@ -74,6 +74,7 @@ | |||
| 374 | 74 | ui, | 74 | ui, |
| 375 | 75 | urlutils, | 75 | urlutils, |
| 376 | 76 | registry, | 76 | registry, |
| 377 | 77 | transport as _mod_transport, | ||
| 378 | 77 | workingtree, | 78 | workingtree, |
| 379 | 78 | ) | 79 | ) |
| 380 | 79 | import bzrlib.branch | 80 | import bzrlib.branch |
| 381 | @@ -103,11 +104,9 @@ | |||
| 382 | 103 | ) | 104 | ) |
| 383 | 104 | import bzrlib.trace | 105 | import bzrlib.trace |
| 384 | 105 | from bzrlib.transport import ( | 106 | from bzrlib.transport import ( |
| 385 | 106 | get_transport, | ||
| 386 | 107 | memory, | 107 | memory, |
| 387 | 108 | pathfilter, | 108 | pathfilter, |
| 388 | 109 | ) | 109 | ) |
| 389 | 110 | import bzrlib.transport | ||
| 390 | 111 | from bzrlib.trace import mutter, note | 110 | from bzrlib.trace import mutter, note |
| 391 | 112 | from bzrlib.tests import ( | 111 | from bzrlib.tests import ( |
| 392 | 113 | test_server, | 112 | test_server, |
| 393 | @@ -943,7 +942,7 @@ | |||
| 394 | 943 | 942 | ||
| 395 | 944 | def permit_dir(self, name): | 943 | def permit_dir(self, name): |
| 396 | 945 | """Permit a directory to be used by this test. See permit_url.""" | 944 | """Permit a directory to be used by this test. See permit_url.""" |
| 398 | 946 | name_transport = get_transport(name) | 945 | name_transport = _mod_transport.get_transport(name) |
| 399 | 947 | self.permit_url(name) | 946 | self.permit_url(name) |
| 400 | 948 | self.permit_url(name_transport.base) | 947 | self.permit_url(name_transport.base) |
| 401 | 949 | 948 | ||
| 402 | @@ -1028,7 +1027,7 @@ | |||
| 403 | 1028 | self.addCleanup(transport_server.stop_server) | 1027 | self.addCleanup(transport_server.stop_server) |
| 404 | 1029 | # Obtain a real transport because if the server supplies a password, it | 1028 | # Obtain a real transport because if the server supplies a password, it |
| 405 | 1030 | # will be hidden from the base on the client side. | 1029 | # will be hidden from the base on the client side. |
| 407 | 1031 | t = get_transport(transport_server.get_url()) | 1030 | t = _mod_transport.get_transport(transport_server.get_url()) |
| 408 | 1032 | # Some transport servers effectively chroot the backing transport; | 1031 | # Some transport servers effectively chroot the backing transport; |
| 409 | 1033 | # others like SFTPServer don't - users of the transport can walk up the | 1032 | # others like SFTPServer don't - users of the transport can walk up the |
| 410 | 1034 | # transport to read the entire backing transport. This wouldn't matter | 1033 | # transport to read the entire backing transport. This wouldn't matter |
| 411 | @@ -1095,7 +1094,7 @@ | |||
| 412 | 1095 | message += '\n' | 1094 | message += '\n' |
| 413 | 1096 | raise AssertionError("%snot equal:\na = %s\nb = %s\n" | 1095 | raise AssertionError("%snot equal:\na = %s\nb = %s\n" |
| 414 | 1097 | % (message, | 1096 | % (message, |
| 416 | 1098 | pformat(a), pformat(b))) | 1097 | pprint.pformat(a), pprint.pformat(b))) |
| 417 | 1099 | 1098 | ||
| 418 | 1100 | assertEquals = assertEqual | 1099 | assertEquals = assertEqual |
| 419 | 1101 | 1100 | ||
| 420 | @@ -1986,7 +1985,9 @@ | |||
| 421 | 1986 | if not allow_plugins: | 1985 | if not allow_plugins: |
| 422 | 1987 | command.append('--no-plugins') | 1986 | command.append('--no-plugins') |
| 423 | 1988 | command.extend(process_args) | 1987 | command.extend(process_args) |
| 425 | 1989 | process = self._popen(command, stdin=PIPE, stdout=PIPE, stderr=PIPE) | 1988 | process = self._popen(command, stdin=subprocess.PIPE, |
| 426 | 1989 | stdout=subprocess.PIPE, | ||
| 427 | 1990 | stderr=subprocess.PIPE) | ||
| 428 | 1990 | finally: | 1991 | finally: |
| 429 | 1991 | restore_environment() | 1992 | restore_environment() |
| 430 | 1992 | if cwd is not None: | 1993 | if cwd is not None: |
| 431 | @@ -2000,7 +2001,7 @@ | |||
| 432 | 2000 | Allows tests to override this method to intercept the calls made to | 2001 | Allows tests to override this method to intercept the calls made to |
| 433 | 2001 | Popen for introspection. | 2002 | Popen for introspection. |
| 434 | 2002 | """ | 2003 | """ |
| 436 | 2003 | return Popen(*args, **kwargs) | 2004 | return subprocess.Popen(*args, **kwargs) |
| 437 | 2004 | 2005 | ||
| 438 | 2005 | def get_source_path(self): | 2006 | def get_source_path(self): |
| 439 | 2006 | """Return the path of the directory containing bzrlib.""" | 2007 | """Return the path of the directory containing bzrlib.""" |
| 440 | @@ -2186,7 +2187,7 @@ | |||
| 441 | 2186 | 2187 | ||
| 442 | 2187 | :param relpath: a path relative to the base url. | 2188 | :param relpath: a path relative to the base url. |
| 443 | 2188 | """ | 2189 | """ |
| 445 | 2189 | t = get_transport(self.get_url(relpath)) | 2190 | t = _mod_transport.get_transport(self.get_url(relpath)) |
| 446 | 2190 | self.assertFalse(t.is_readonly()) | 2191 | self.assertFalse(t.is_readonly()) |
| 447 | 2191 | return t | 2192 | return t |
| 448 | 2192 | 2193 | ||
| 449 | @@ -2198,7 +2199,7 @@ | |||
| 450 | 2198 | 2199 | ||
| 451 | 2199 | :param relpath: a path relative to the base url. | 2200 | :param relpath: a path relative to the base url. |
| 452 | 2200 | """ | 2201 | """ |
| 454 | 2201 | t = get_transport(self.get_readonly_url(relpath)) | 2202 | t = _mod_transport.get_transport(self.get_readonly_url(relpath)) |
| 455 | 2202 | self.assertTrue(t.is_readonly()) | 2203 | self.assertTrue(t.is_readonly()) |
| 456 | 2203 | return t | 2204 | return t |
| 457 | 2204 | 2205 | ||
| 458 | @@ -2334,7 +2335,7 @@ | |||
| 459 | 2334 | propagating. This method ensures than a test did not leaked. | 2335 | propagating. This method ensures than a test did not leaked. |
| 460 | 2335 | """ | 2336 | """ |
| 461 | 2336 | root = TestCaseWithMemoryTransport.TEST_ROOT | 2337 | root = TestCaseWithMemoryTransport.TEST_ROOT |
| 463 | 2337 | self.permit_url(get_transport(root).base) | 2338 | self.permit_url(_mod_transport.get_transport(root).base) |
| 464 | 2338 | wt = workingtree.WorkingTree.open(root) | 2339 | wt = workingtree.WorkingTree.open(root) |
| 465 | 2339 | last_rev = wt.last_revision() | 2340 | last_rev = wt.last_revision() |
| 466 | 2340 | if last_rev != 'null:': | 2341 | if last_rev != 'null:': |
| 467 | @@ -2385,7 +2386,7 @@ | |||
| 468 | 2385 | # might be a relative or absolute path | 2386 | # might be a relative or absolute path |
| 469 | 2386 | maybe_a_url = self.get_url(relpath) | 2387 | maybe_a_url = self.get_url(relpath) |
| 470 | 2387 | segments = maybe_a_url.rsplit('/', 1) | 2388 | segments = maybe_a_url.rsplit('/', 1) |
| 472 | 2388 | t = get_transport(maybe_a_url) | 2389 | t = _mod_transport.get_transport(maybe_a_url) |
| 473 | 2389 | if len(segments) > 1 and segments[-1] not in ('', '.'): | 2390 | if len(segments) > 1 and segments[-1] not in ('', '.'): |
| 474 | 2390 | t.ensure_base() | 2391 | t.ensure_base() |
| 475 | 2391 | if format is None: | 2392 | if format is None: |
| 476 | @@ -2413,7 +2414,8 @@ | |||
| 477 | 2413 | backing_server = self.get_server() | 2414 | backing_server = self.get_server() |
| 478 | 2414 | smart_server = test_server.SmartTCPServer_for_testing() | 2415 | smart_server = test_server.SmartTCPServer_for_testing() |
| 479 | 2415 | self.start_server(smart_server, backing_server) | 2416 | self.start_server(smart_server, backing_server) |
| 481 | 2416 | remote_transport = get_transport(smart_server.get_url()).clone(path) | 2417 | remote_transport = _mod_transport.get_transport(smart_server.get_url() |
| 482 | 2418 | ).clone(path) | ||
| 483 | 2417 | return remote_transport | 2419 | return remote_transport |
| 484 | 2418 | 2420 | ||
| 485 | 2419 | def make_branch_and_memory_tree(self, relpath, format=None): | 2421 | def make_branch_and_memory_tree(self, relpath, format=None): |
| 486 | @@ -2568,7 +2570,7 @@ | |||
| 487 | 2568 | "a list or a tuple. Got %r instead" % (shape,)) | 2570 | "a list or a tuple. Got %r instead" % (shape,)) |
| 488 | 2569 | # It's OK to just create them using forward slashes on windows. | 2571 | # It's OK to just create them using forward slashes on windows. |
| 489 | 2570 | if transport is None or transport.is_readonly(): | 2572 | if transport is None or transport.is_readonly(): |
| 491 | 2571 | transport = get_transport(".") | 2573 | transport = _mod_transport.get_transport(".") |
| 492 | 2572 | for name in shape: | 2574 | for name in shape: |
| 493 | 2573 | self.assertIsInstance(name, basestring) | 2575 | self.assertIsInstance(name, basestring) |
| 494 | 2574 | if name[-1] == '/': | 2576 | if name[-1] == '/': |
| 495 | @@ -3315,10 +3317,12 @@ | |||
| 496 | 3315 | '--subunit'] | 3317 | '--subunit'] |
| 497 | 3316 | if '--no-plugins' in sys.argv: | 3318 | if '--no-plugins' in sys.argv: |
| 498 | 3317 | argv.append('--no-plugins') | 3319 | argv.append('--no-plugins') |
| 503 | 3318 | # stderr=STDOUT would be ideal, but until we prevent noise on | 3320 | # stderr=subprocess.STDOUT would be ideal, but until we prevent |
| 504 | 3319 | # stderr it can interrupt the subunit protocol. | 3321 | # noise on stderr it can interrupt the subunit protocol. |
| 505 | 3320 | process = Popen(argv, stdin=PIPE, stdout=PIPE, stderr=PIPE, | 3322 | process = subprocess.Popen(argv, stdin=subprocess.PIPE, |
| 506 | 3321 | bufsize=1) | 3323 | stdout=subprocess.PIPE, |
| 507 | 3324 | stderr=subprocess.PIPE, | ||
| 508 | 3325 | bufsize=1) | ||
| 509 | 3322 | test = TestInSubprocess(process, test_list_file_name) | 3326 | test = TestInSubprocess(process, test_list_file_name) |
| 510 | 3323 | result.append(test) | 3327 | result.append(test) |
| 511 | 3324 | except: | 3328 | except: |
| 512 | @@ -4043,7 +4047,7 @@ | |||
| 513 | 4043 | :param new_id: The id to assign to it. | 4047 | :param new_id: The id to assign to it. |
| 514 | 4044 | :return: The new test. | 4048 | :return: The new test. |
| 515 | 4045 | """ | 4049 | """ |
| 517 | 4046 | new_test = copy(test) | 4050 | new_test = copy.copy(test) |
| 518 | 4047 | new_test.id = lambda: new_id | 4051 | new_test.id = lambda: new_id |
| 519 | 4048 | return new_test | 4052 | return new_test |
| 520 | 4049 | 4053 | ||
| 521 | 4050 | 4054 | ||
| 522 | === modified file 'bzrlib/tests/blackbox/__init__.py' | |||
| 523 | --- bzrlib/tests/blackbox/__init__.py 2010-06-20 22:38:35 +0000 | |||
| 524 | +++ bzrlib/tests/blackbox/__init__.py 2010-06-29 17:48:31 +0000 | |||
| 525 | @@ -1,4 +1,4 @@ | |||
| 527 | 1 | # Copyright (C) 2005-2007, 2010 Canonical Ltd | 1 | # Copyright (C) 2005-2010 Canonical Ltd |
| 528 | 2 | # | 2 | # |
| 529 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 530 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 531 | 5 | 5 | ||
| 532 | === modified file 'bzrlib/tests/blackbox/test_alias.py' | |||
| 533 | --- bzrlib/tests/blackbox/test_alias.py 2010-06-11 07:32:12 +0000 | |||
| 534 | +++ bzrlib/tests/blackbox/test_alias.py 2010-06-29 17:48:31 +0000 | |||
| 535 | @@ -1,4 +1,4 @@ | |||
| 537 | 1 | # Copyright (C) 2005, 2006, 2007 Canonical Ltd | 1 | # Copyright (C) 2008, 2009, 2010 Canonical Ltd |
| 538 | 2 | # | 2 | # |
| 539 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 540 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 541 | 5 | 5 | ||
| 542 | === modified file 'bzrlib/tests/blackbox/test_aliases.py' | |||
| 543 | --- bzrlib/tests/blackbox/test_aliases.py 2010-06-11 07:32:12 +0000 | |||
| 544 | +++ bzrlib/tests/blackbox/test_aliases.py 2010-06-29 17:48:31 +0000 | |||
| 545 | @@ -1,4 +1,4 @@ | |||
| 547 | 1 | # Copyright (C) 2005, 2006 Canonical Ltd | 1 | # Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd |
| 548 | 2 | # | 2 | # |
| 549 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 550 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 551 | 5 | 5 | ||
| 552 | === modified file 'bzrlib/tests/blackbox/test_cat_revision.py' | |||
| 553 | --- bzrlib/tests/blackbox/test_cat_revision.py 2010-06-11 06:52:28 +0000 | |||
| 554 | +++ bzrlib/tests/blackbox/test_cat_revision.py 2010-06-29 17:48:31 +0000 | |||
| 555 | @@ -1,4 +1,4 @@ | |||
| 557 | 1 | # Copyright (C) 2004-2010 Canonical Ltd | 1 | # Copyright (C) 2007-2010 Canonical Ltd |
| 558 | 2 | # | 2 | # |
| 559 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 560 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 561 | 5 | 5 | ||
| 562 | === modified file 'bzrlib/tests/blackbox/test_check.py' | |||
| 563 | --- bzrlib/tests/blackbox/test_check.py 2010-06-11 07:32:12 +0000 | |||
| 564 | +++ bzrlib/tests/blackbox/test_check.py 2010-06-29 17:48:31 +0000 | |||
| 565 | @@ -1,4 +1,4 @@ | |||
| 567 | 1 | # Copyright (C) 2007, 2009 Canonical Ltd | 1 | # Copyright (C) 2007-2010 Canonical Ltd |
| 568 | 2 | # | 2 | # |
| 569 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 570 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 571 | 5 | 5 | ||
| 572 | === modified file 'bzrlib/tests/blackbox/test_dpush.py' | |||
| 573 | --- bzrlib/tests/blackbox/test_dpush.py 2010-06-20 22:38:35 +0000 | |||
| 574 | +++ bzrlib/tests/blackbox/test_dpush.py 2010-06-29 17:48:31 +0000 | |||
| 575 | @@ -1,4 +1,4 @@ | |||
| 577 | 1 | # Copyright (C) 2005, 2007-2010 Canonical Ltd | 1 | # Copyright (C) 2009, 2010 Canonical Ltd |
| 578 | 2 | # | 2 | # |
| 579 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 580 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 581 | 5 | 5 | ||
| 582 | === modified file 'bzrlib/tests/blackbox/test_filesystem_cicp.py' | |||
| 583 | --- bzrlib/tests/blackbox/test_filesystem_cicp.py 2010-06-11 07:23:10 +0000 | |||
| 584 | +++ bzrlib/tests/blackbox/test_filesystem_cicp.py 2010-06-29 17:48:31 +0000 | |||
| 585 | @@ -1,4 +1,4 @@ | |||
| 587 | 1 | # Copyright (C) 2008, 2010 Canonical Ltd | 1 | # Copyright (C) 2008, 2009, 2010 Canonical Ltd |
| 588 | 2 | # | 2 | # |
| 589 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 590 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 591 | 5 | 5 | ||
| 592 | === modified file 'bzrlib/tests/blackbox/test_find_merge_base.py' | |||
| 593 | --- bzrlib/tests/blackbox/test_find_merge_base.py 2010-06-11 07:32:12 +0000 | |||
| 594 | +++ bzrlib/tests/blackbox/test_find_merge_base.py 2010-06-29 17:48:31 +0000 | |||
| 595 | @@ -1,4 +1,4 @@ | |||
| 597 | 1 | # Copyright (C) 2005 Canonical Ltd | 1 | # Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd |
| 598 | 2 | # -*- coding: utf-8 -*- | 2 | # -*- coding: utf-8 -*- |
| 599 | 3 | # | 3 | # |
| 600 | 4 | # This program is free software; you can redistribute it and/or modify | 4 | # This program is free software; you can redistribute it and/or modify |
| 601 | 5 | 5 | ||
| 602 | === modified file 'bzrlib/tests/blackbox/test_ignored.py' | |||
| 603 | --- bzrlib/tests/blackbox/test_ignored.py 2010-06-11 07:32:12 +0000 | |||
| 604 | +++ bzrlib/tests/blackbox/test_ignored.py 2010-06-29 17:48:31 +0000 | |||
| 605 | @@ -1,4 +1,4 @@ | |||
| 607 | 1 | # Copyright (C) 2006-2010 Canonical Ltd | 1 | # Copyright (C) 2006, 2009, 2010 Canonical Ltd |
| 608 | 2 | # | 2 | # |
| 609 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 610 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 611 | 5 | 5 | ||
| 612 | === modified file 'bzrlib/tests/blackbox/test_merge_directive.py' | |||
| 613 | --- bzrlib/tests/blackbox/test_merge_directive.py 2010-05-28 14:15:28 +0000 | |||
| 614 | +++ bzrlib/tests/blackbox/test_merge_directive.py 2010-06-29 17:48:31 +0000 | |||
| 615 | @@ -1,4 +1,4 @@ | |||
| 617 | 1 | # Copyright (C) 2007 Canonical Ltd | 1 | # Copyright (C) 2007, 2009, 2010 Canonical Ltd |
| 618 | 2 | # | 2 | # |
| 619 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 620 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 621 | 5 | 5 | ||
| 622 | === modified file 'bzrlib/tests/blackbox/test_missing.py' | |||
| 623 | --- bzrlib/tests/blackbox/test_missing.py 2010-05-28 14:15:28 +0000 | |||
| 624 | +++ bzrlib/tests/blackbox/test_missing.py 2010-06-29 17:48:31 +0000 | |||
| 625 | @@ -1,4 +1,4 @@ | |||
| 627 | 1 | # Copyright (C) 2005, 2008 Canonical Ltd | 1 | # Copyright (C) 2005-2010 Canonical Ltd |
| 628 | 2 | # | 2 | # |
| 629 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 630 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 631 | 5 | 5 | ||
| 632 | === modified file 'bzrlib/tests/blackbox/test_modified.py' | |||
| 633 | --- bzrlib/tests/blackbox/test_modified.py 2010-06-11 07:32:12 +0000 | |||
| 634 | +++ bzrlib/tests/blackbox/test_modified.py 2010-06-29 17:48:31 +0000 | |||
| 635 | @@ -1,4 +1,4 @@ | |||
| 637 | 1 | # Copyright (C) 2006-2010 Canonical Ltd | 1 | # Copyright (C) 2008, 2009, 2010 Canonical Ltd |
| 638 | 2 | # -*- coding: utf-8 -*- | 2 | # -*- coding: utf-8 -*- |
| 639 | 3 | # | 3 | # |
| 640 | 4 | # This program is free software; you can redistribute it and/or modify | 4 | # This program is free software; you can redistribute it and/or modify |
| 641 | 5 | 5 | ||
| 642 | === modified file 'bzrlib/tests/blackbox/test_nick.py' | |||
| 643 | --- bzrlib/tests/blackbox/test_nick.py 2010-06-11 07:32:12 +0000 | |||
| 644 | +++ bzrlib/tests/blackbox/test_nick.py 2010-06-29 17:48:31 +0000 | |||
| 645 | @@ -1,4 +1,4 @@ | |||
| 647 | 1 | # Copyright (C) 2005-2010 Canonical Ltd | 1 | # Copyright (C) 2006-2010 Canonical Ltd |
| 648 | 2 | # | 2 | # |
| 649 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 650 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 651 | 5 | 5 | ||
| 652 | === modified file 'bzrlib/tests/blackbox/test_remove.py' | |||
| 653 | --- bzrlib/tests/blackbox/test_remove.py 2010-06-11 07:32:12 +0000 | |||
| 654 | +++ bzrlib/tests/blackbox/test_remove.py 2010-06-29 17:48:31 +0000 | |||
| 655 | @@ -1,4 +1,4 @@ | |||
| 657 | 1 | # Copyright (C) 2005, 2006 Canonical Ltd | 1 | # Copyright (C) 2006-2010 Canonical Ltd |
| 658 | 2 | # | 2 | # |
| 659 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 660 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 661 | 5 | 5 | ||
| 662 | === modified file 'bzrlib/tests/blackbox/test_remove_tree.py' | |||
| 663 | --- bzrlib/tests/blackbox/test_remove_tree.py 2010-06-11 07:32:12 +0000 | |||
| 664 | +++ bzrlib/tests/blackbox/test_remove_tree.py 2010-06-29 17:48:31 +0000 | |||
| 665 | @@ -1,4 +1,4 @@ | |||
| 667 | 1 | # Copyright (C) 2006 Canonical Ltd | 1 | # Copyright (C) 2006-2010 Canonical Ltd |
| 668 | 2 | # | 2 | # |
| 669 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 670 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 671 | 5 | 5 | ||
| 672 | === modified file 'bzrlib/tests/blackbox/test_revert.py' | |||
| 673 | --- bzrlib/tests/blackbox/test_revert.py 2010-06-11 07:32:12 +0000 | |||
| 674 | +++ bzrlib/tests/blackbox/test_revert.py 2010-06-29 17:48:31 +0000 | |||
| 675 | @@ -1,4 +1,4 @@ | |||
| 677 | 1 | # Copyright (C) 2005, 2007 Canonical Ltd | 1 | # Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd |
| 678 | 2 | # | 2 | # |
| 679 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 680 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 681 | 5 | 5 | ||
| 682 | === modified file 'bzrlib/tests/blackbox/test_revision_info.py' | |||
| 683 | --- bzrlib/tests/blackbox/test_revision_info.py 2010-06-20 22:38:35 +0000 | |||
| 684 | +++ bzrlib/tests/blackbox/test_revision_info.py 2010-06-29 17:48:31 +0000 | |||
| 685 | @@ -1,4 +1,4 @@ | |||
| 687 | 1 | # Copyright (C) 2004-2005, 2009-2010 Canonical Ltd | 1 | # Copyright (C) 2005-2010 Canonical Ltd |
| 688 | 2 | # | 2 | # |
| 689 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 690 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 691 | 5 | 5 | ||
| 692 | === modified file 'bzrlib/tests/blackbox/test_serve.py' | |||
| 693 | --- bzrlib/tests/blackbox/test_serve.py 2010-02-17 17:11:16 +0000 | |||
| 694 | +++ bzrlib/tests/blackbox/test_serve.py 2010-06-29 17:48:31 +0000 | |||
| 695 | @@ -31,6 +31,7 @@ | |||
| 696 | 31 | errors, | 31 | errors, |
| 697 | 32 | osutils, | 32 | osutils, |
| 698 | 33 | revision as _mod_revision, | 33 | revision as _mod_revision, |
| 699 | 34 | transport, | ||
| 700 | 34 | urlutils, | 35 | urlutils, |
| 701 | 35 | ) | 36 | ) |
| 702 | 36 | from bzrlib.branch import Branch | 37 | from bzrlib.branch import Branch |
| 703 | @@ -43,7 +44,7 @@ | |||
| 704 | 43 | TestSkipped, | 44 | TestSkipped, |
| 705 | 44 | ) | 45 | ) |
| 706 | 45 | from bzrlib.trace import mutter | 46 | from bzrlib.trace import mutter |
| 708 | 46 | from bzrlib.transport import get_transport, remote | 47 | from bzrlib.transport import remote |
| 709 | 47 | 48 | ||
| 710 | 48 | 49 | ||
| 711 | 49 | class TestBzrServeBase(TestCaseWithTransport): | 50 | class TestBzrServeBase(TestCaseWithTransport): |
| 712 | @@ -192,8 +193,8 @@ | |||
| 713 | 192 | def test_bzr_serve_port_readonly(self): | 193 | def test_bzr_serve_port_readonly(self): |
| 714 | 193 | """bzr server should provide a read only filesystem by default.""" | 194 | """bzr server should provide a read only filesystem by default.""" |
| 715 | 194 | process, url = self.start_server_port() | 195 | process, url = self.start_server_port() |
| 718 | 195 | transport = get_transport(url) | 196 | t = transport.get_transport(url) |
| 719 | 196 | self.assertRaises(errors.TransportNotPossible, transport.mkdir, 'adir') | 197 | self.assertRaises(errors.TransportNotPossible, t.mkdir, 'adir') |
| 720 | 197 | self.assertServerFinishesCleanly(process) | 198 | self.assertServerFinishesCleanly(process) |
| 721 | 198 | 199 | ||
| 722 | 199 | def test_bzr_serve_port_readwrite(self): | 200 | def test_bzr_serve_port_readwrite(self): |
| 723 | 200 | 201 | ||
| 724 | === modified file 'bzrlib/tests/blackbox/test_upgrade.py' | |||
| 725 | --- bzrlib/tests/blackbox/test_upgrade.py 2010-04-16 07:56:51 +0000 | |||
| 726 | +++ bzrlib/tests/blackbox/test_upgrade.py 2010-06-29 17:48:31 +0000 | |||
| 727 | @@ -21,6 +21,7 @@ | |||
| 728 | 21 | from bzrlib import ( | 21 | from bzrlib import ( |
| 729 | 22 | bzrdir, | 22 | bzrdir, |
| 730 | 23 | repository, | 23 | repository, |
| 731 | 24 | transport, | ||
| 732 | 24 | ) | 25 | ) |
| 733 | 25 | from bzrlib.tests import ( | 26 | from bzrlib.tests import ( |
| 734 | 26 | features, | 27 | features, |
| 735 | @@ -28,7 +29,6 @@ | |||
| 736 | 28 | TestCaseWithTransport, | 29 | TestCaseWithTransport, |
| 737 | 29 | ) | 30 | ) |
| 738 | 30 | from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer | 31 | from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer |
| 739 | 31 | from bzrlib.transport import get_transport | ||
| 740 | 32 | from bzrlib.repofmt.knitrepo import ( | 32 | from bzrlib.repofmt.knitrepo import ( |
| 741 | 33 | RepositoryFormatKnit1, | 33 | RepositoryFormatKnit1, |
| 742 | 34 | ) | 34 | ) |
| 743 | @@ -79,7 +79,8 @@ | |||
| 744 | 79 | (out, err) = self.run_bzr('upgrade current_format_checkout', retcode=3) | 79 | (out, err) = self.run_bzr('upgrade current_format_checkout', retcode=3) |
| 745 | 80 | self.assertEqual("This is a checkout. The branch (%s) needs to be " | 80 | self.assertEqual("This is a checkout. The branch (%s) needs to be " |
| 746 | 81 | "upgraded separately.\n" | 81 | "upgraded separately.\n" |
| 748 | 82 | % get_transport(self.get_url('current_format_branch')).base, | 82 | % transport.get_transport( |
| 749 | 83 | self.get_url('current_format_branch')).base, | ||
| 750 | 83 | out) | 84 | out) |
| 751 | 84 | self.assertEqualDiff("bzr: ERROR: The branch format Meta " | 85 | self.assertEqualDiff("bzr: ERROR: The branch format Meta " |
| 752 | 85 | "directory format 1 is already at the most " | 86 | "directory format 1 is already at the most " |
| 753 | @@ -101,7 +102,7 @@ | |||
| 754 | 101 | def test_upgrade_explicit_metaformat(self): | 102 | def test_upgrade_explicit_metaformat(self): |
| 755 | 102 | # users can force an upgrade to metadir format. | 103 | # users can force an upgrade to metadir format. |
| 756 | 103 | self.make_format_5_branch() | 104 | self.make_format_5_branch() |
| 758 | 104 | url = get_transport(self.get_url('format_5_branch')).base | 105 | url = transport.get_transport(self.get_url('format_5_branch')).base |
| 759 | 105 | # check --format takes effect | 106 | # check --format takes effect |
| 760 | 106 | bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5()) | 107 | bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5()) |
| 761 | 107 | backup_dir = 'backup.bzr.~1~' | 108 | backup_dir = 'backup.bzr.~1~' |
| 762 | @@ -125,7 +126,7 @@ | |||
| 763 | 125 | # users can force an upgrade to knit format from a metadir weave | 126 | # users can force an upgrade to knit format from a metadir weave |
| 764 | 126 | # branch | 127 | # branch |
| 765 | 127 | self.make_metadir_weave_branch() | 128 | self.make_metadir_weave_branch() |
| 767 | 128 | url = get_transport(self.get_url('metadir_weave_branch')).base | 129 | url = transport.get_transport(self.get_url('metadir_weave_branch')).base |
| 768 | 129 | # check --format takes effect | 130 | # check --format takes effect |
| 769 | 130 | bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5()) | 131 | bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5()) |
| 770 | 131 | backup_dir = 'backup.bzr.~1~' | 132 | backup_dir = 'backup.bzr.~1~' |
| 771 | @@ -163,14 +164,14 @@ | |||
| 772 | 163 | 164 | ||
| 773 | 164 | def test_upgrade_with_existing_backup_dir(self): | 165 | def test_upgrade_with_existing_backup_dir(self): |
| 774 | 165 | self.make_format_5_branch() | 166 | self.make_format_5_branch() |
| 777 | 166 | transport = get_transport(self.get_url('format_5_branch')) | 167 | t = transport.get_transport(self.get_url('format_5_branch')) |
| 778 | 167 | url = transport.base | 168 | url = t.base |
| 779 | 168 | bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5()) | 169 | bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5()) |
| 780 | 169 | backup_dir1 = 'backup.bzr.~1~' | 170 | backup_dir1 = 'backup.bzr.~1~' |
| 781 | 170 | backup_dir2 = 'backup.bzr.~2~' | 171 | backup_dir2 = 'backup.bzr.~2~' |
| 782 | 171 | # explicitly create backup_dir1. bzr should create the .~2~ directory | 172 | # explicitly create backup_dir1. bzr should create the .~2~ directory |
| 783 | 172 | # as backup | 173 | # as backup |
| 785 | 173 | transport.mkdir(backup_dir1) | 174 | t.mkdir(backup_dir1) |
| 786 | 174 | (out, err) = self.run_bzr( | 175 | (out, err) = self.run_bzr( |
| 787 | 175 | ['upgrade', '--format=metaweave', url]) | 176 | ['upgrade', '--format=metaweave', url]) |
| 788 | 176 | self.assertEqualDiff("""starting upgrade of %s | 177 | self.assertEqualDiff("""starting upgrade of %s |
| 789 | @@ -186,14 +187,14 @@ | |||
| 790 | 186 | self.assertTrue(isinstance( | 187 | self.assertTrue(isinstance( |
| 791 | 187 | bzrdir.BzrDir.open(self.get_url('format_5_branch'))._format, | 188 | bzrdir.BzrDir.open(self.get_url('format_5_branch'))._format, |
| 792 | 188 | bzrdir.BzrDirMetaFormat1)) | 189 | bzrdir.BzrDirMetaFormat1)) |
| 794 | 189 | self.assertTrue(transport.has(backup_dir2)) | 190 | self.assertTrue(t.has(backup_dir2)) |
| 795 | 190 | 191 | ||
| 796 | 191 | class SFTPTests(TestCaseWithSFTPServer): | 192 | class SFTPTests(TestCaseWithSFTPServer): |
| 797 | 192 | """Tests for upgrade over sftp.""" | 193 | """Tests for upgrade over sftp.""" |
| 798 | 193 | 194 | ||
| 799 | 194 | def test_upgrade_url(self): | 195 | def test_upgrade_url(self): |
| 800 | 195 | self.run_bzr('init --format=weave') | 196 | self.run_bzr('init --format=weave') |
| 802 | 196 | t = get_transport(self.get_url()) | 197 | t = transport.get_transport(self.get_url()) |
| 803 | 197 | url = t.base | 198 | url = t.base |
| 804 | 198 | out, err = self.run_bzr(['upgrade', '--format=knit', url]) | 199 | out, err = self.run_bzr(['upgrade', '--format=knit', url]) |
| 805 | 199 | backup_dir = 'backup.bzr.~1~' | 200 | backup_dir = 'backup.bzr.~1~' |
| 806 | 200 | 201 | ||
| 807 | === modified file 'bzrlib/tests/blackbox/test_whoami.py' | |||
| 808 | --- bzrlib/tests/blackbox/test_whoami.py 2010-06-20 22:54:30 +0000 | |||
| 809 | +++ bzrlib/tests/blackbox/test_whoami.py 2010-06-29 17:48:31 +0000 | |||
| 810 | @@ -1,4 +1,4 @@ | |||
| 812 | 1 | # Copyright (C) 2006 Canonical Ltd | 1 | # Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd |
| 813 | 2 | # | 2 | # |
| 814 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 815 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 816 | 5 | 5 | ||
| 817 | === modified file 'bzrlib/tests/http_utils.py' | |||
| 818 | --- bzrlib/tests/http_utils.py 2010-02-17 17:11:16 +0000 | |||
| 819 | +++ bzrlib/tests/http_utils.py 2010-06-29 17:48:31 +0000 | |||
| 820 | @@ -106,10 +106,20 @@ | |||
| 821 | 106 | one. This will currently fail if the primary transport is not | 106 | one. This will currently fail if the primary transport is not |
| 822 | 107 | backed by regular disk files. | 107 | backed by regular disk files. |
| 823 | 108 | """ | 108 | """ |
| 824 | 109 | |||
| 825 | 110 | # This can be overriden or parametrized by daughter clasess if needed, but | ||
| 826 | 111 | # it must exist so that the create_transport_readonly_server() method can | ||
| 827 | 112 | # propagate it. | ||
| 828 | 113 | _protocol_version = None | ||
| 829 | 114 | |||
| 830 | 109 | def setUp(self): | 115 | def setUp(self): |
| 831 | 110 | super(TestCaseWithWebserver, self).setUp() | 116 | super(TestCaseWithWebserver, self).setUp() |
| 832 | 111 | self.transport_readonly_server = http_server.HttpServer | 117 | self.transport_readonly_server = http_server.HttpServer |
| 833 | 112 | 118 | ||
| 834 | 119 | def create_transport_readonly_server(self): | ||
| 835 | 120 | return self.transport_readonly_server( | ||
| 836 | 121 | protocol_version=self._protocol_version) | ||
| 837 | 122 | |||
| 838 | 113 | 123 | ||
| 839 | 114 | class TestCaseWithTwoWebservers(TestCaseWithWebserver): | 124 | class TestCaseWithTwoWebservers(TestCaseWithWebserver): |
| 840 | 115 | """A support class providing readonly urls on two servers that are http://. | 125 | """A support class providing readonly urls on two servers that are http://. |
| 841 | @@ -127,7 +137,8 @@ | |||
| 842 | 127 | 137 | ||
| 843 | 128 | This is mostly a hook for daughter classes. | 138 | This is mostly a hook for daughter classes. |
| 844 | 129 | """ | 139 | """ |
| 846 | 130 | return self.transport_secondary_server() | 140 | return self.transport_secondary_server( |
| 847 | 141 | protocol_version=self._protocol_version) | ||
| 848 | 131 | 142 | ||
| 849 | 132 | def get_secondary_server(self): | 143 | def get_secondary_server(self): |
| 850 | 133 | """Get the server instance for the secondary transport.""" | 144 | """Get the server instance for the secondary transport.""" |
| 851 | @@ -218,7 +229,8 @@ | |||
| 852 | 218 | def create_transport_secondary_server(self): | 229 | def create_transport_secondary_server(self): |
| 853 | 219 | """Create the secondary server redirecting to the primary server""" | 230 | """Create the secondary server redirecting to the primary server""" |
| 854 | 220 | new = self.get_readonly_server() | 231 | new = self.get_readonly_server() |
| 856 | 221 | redirecting = HTTPServerRedirecting() | 232 | redirecting = HTTPServerRedirecting( |
| 857 | 233 | protocol_version=self._protocol_version) | ||
| 858 | 222 | redirecting.redirect_to(new.host, new.port) | 234 | redirecting.redirect_to(new.host, new.port) |
| 859 | 223 | return redirecting | 235 | return redirecting |
| 860 | 224 | 236 | ||
| 861 | 225 | 237 | ||
| 862 | === modified file 'bzrlib/tests/per_branch/test_bound_sftp.py' | |||
| 863 | --- bzrlib/tests/per_branch/test_bound_sftp.py 2010-02-11 09:27:55 +0000 | |||
| 864 | +++ bzrlib/tests/per_branch/test_bound_sftp.py 2010-06-29 17:48:31 +0000 | |||
| 865 | @@ -144,13 +144,13 @@ | |||
| 866 | 144 | wt_child2.commit, 'child2', rev_id='r@d-2') | 144 | wt_child2.commit, 'child2', rev_id='r@d-2') |
| 867 | 145 | 145 | ||
| 868 | 146 | def test_unbinding(self): | 146 | def test_unbinding(self): |
| 870 | 147 | from bzrlib.transport import get_transport | 147 | from bzrlib import transport |
| 871 | 148 | b_base, wt_child = self.create_branches() | 148 | b_base, wt_child = self.create_branches() |
| 872 | 149 | 149 | ||
| 873 | 150 | # TestCaseWithSFTPServer only allows you to connect one time | 150 | # TestCaseWithSFTPServer only allows you to connect one time |
| 874 | 151 | # to the SFTP server. So we have to create a connection and | 151 | # to the SFTP server. So we have to create a connection and |
| 875 | 152 | # keep it around, so that it can be reused | 152 | # keep it around, so that it can be reused |
| 877 | 153 | __unused_t = get_transport(self.get_url('.')) | 153 | __unused_t = transport.get_transport(self.get_url('.')) |
| 878 | 154 | 154 | ||
| 879 | 155 | wt_base = b_base.bzrdir.open_workingtree() | 155 | wt_base = b_base.bzrdir.open_workingtree() |
| 880 | 156 | open('base/a', 'wb').write('new base contents\n') | 156 | open('base/a', 'wb').write('new base contents\n') |
| 881 | 157 | 157 | ||
| 882 | === modified file 'bzrlib/tests/per_branch/test_permissions.py' | |||
| 883 | --- bzrlib/tests/per_branch/test_permissions.py 2009-09-07 08:46:00 +0000 | |||
| 884 | +++ bzrlib/tests/per_branch/test_permissions.py 2010-06-29 17:48:31 +0000 | |||
| 885 | @@ -1,4 +1,4 @@ | |||
| 887 | 1 | # Copyright (C) 2005, 2008 Canonical Ltd | 1 | # Copyright (C) 2006-2010 Canonical Ltd |
| 888 | 2 | # | 2 | # |
| 889 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 890 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 891 | @@ -38,7 +38,6 @@ | |||
| 892 | 38 | from bzrlib.remote import RemoteBranchFormat | 38 | from bzrlib.remote import RemoteBranchFormat |
| 893 | 39 | from bzrlib.tests.test_permissions import chmod_r, check_mode_r | 39 | from bzrlib.tests.test_permissions import chmod_r, check_mode_r |
| 894 | 40 | from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer | 40 | from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer |
| 895 | 41 | from bzrlib.transport import get_transport | ||
| 896 | 42 | from bzrlib.workingtree import WorkingTree | 41 | from bzrlib.workingtree import WorkingTree |
| 897 | 43 | 42 | ||
| 898 | 44 | 43 | ||
| 899 | 45 | 44 | ||
| 900 | === modified file 'bzrlib/tests/per_branch/test_stacking.py' | |||
| 901 | --- bzrlib/tests/per_branch/test_stacking.py 2009-08-20 04:09:58 +0000 | |||
| 902 | +++ bzrlib/tests/per_branch/test_stacking.py 2010-06-29 17:48:31 +0000 | |||
| 903 | @@ -1,4 +1,4 @@ | |||
| 905 | 1 | # Copyright (C) 2008 Canonical Ltd | 1 | # Copyright (C) 2008, 2009, 2010 Canonical Ltd |
| 906 | 2 | # | 2 | # |
| 907 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 908 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 909 | @@ -26,7 +26,6 @@ | |||
| 910 | 26 | from bzrlib.smart import server | 26 | from bzrlib.smart import server |
| 911 | 27 | from bzrlib.tests import TestNotApplicable, KnownFailure, transport_util | 27 | from bzrlib.tests import TestNotApplicable, KnownFailure, transport_util |
| 912 | 28 | from bzrlib.tests.per_branch import TestCaseWithBranch | 28 | from bzrlib.tests.per_branch import TestCaseWithBranch |
| 913 | 29 | from bzrlib.transport import get_transport | ||
| 914 | 30 | 29 | ||
| 915 | 31 | 30 | ||
| 916 | 32 | unstackable_format_errors = ( | 31 | unstackable_format_errors = ( |
| 917 | 33 | 32 | ||
| 918 | === modified file 'bzrlib/tests/per_bzrdir/test_bzrdir.py' | |||
| 919 | --- bzrlib/tests/per_bzrdir/test_bzrdir.py 2010-06-24 06:29:40 +0000 | |||
| 920 | +++ bzrlib/tests/per_bzrdir/test_bzrdir.py 2010-06-29 17:48:31 +0000 | |||
| 921 | @@ -55,7 +55,6 @@ | |||
| 922 | 55 | ) | 55 | ) |
| 923 | 56 | from bzrlib.tests.per_bzrdir import TestCaseWithBzrDir | 56 | from bzrlib.tests.per_bzrdir import TestCaseWithBzrDir |
| 924 | 57 | from bzrlib.trace import mutter | 57 | from bzrlib.trace import mutter |
| 925 | 58 | from bzrlib.transport import get_transport | ||
| 926 | 59 | from bzrlib.transport.local import LocalTransport | 58 | from bzrlib.transport.local import LocalTransport |
| 927 | 60 | from bzrlib.ui import ( | 59 | from bzrlib.ui import ( |
| 928 | 61 | CannedInputUIFactory, | 60 | CannedInputUIFactory, |
| 929 | @@ -202,7 +201,7 @@ | |||
| 930 | 202 | A simple wrapper for from_bzrdir.sprout that translates NotLocalUrl into | 201 | A simple wrapper for from_bzrdir.sprout that translates NotLocalUrl into |
| 931 | 203 | TestSkipped. Returns the newly sprouted bzrdir. | 202 | TestSkipped. Returns the newly sprouted bzrdir. |
| 932 | 204 | """ | 203 | """ |
| 934 | 205 | to_transport = get_transport(to_url) | 204 | to_transport = transport.get_transport(to_url) |
| 935 | 206 | if not isinstance(to_transport, LocalTransport): | 205 | if not isinstance(to_transport, LocalTransport): |
| 936 | 207 | raise TestSkipped('Cannot sprout to remote bzrdirs.') | 206 | raise TestSkipped('Cannot sprout to remote bzrdirs.') |
| 937 | 208 | target = from_bzrdir.sprout(to_url, revision_id=revision_id, | 207 | target = from_bzrdir.sprout(to_url, revision_id=revision_id, |
| 938 | @@ -1206,8 +1205,8 @@ | |||
| 939 | 1206 | '_network_name', None), | 1205 | '_network_name', None), |
| 940 | 1207 | None) | 1206 | None) |
| 941 | 1208 | # supported formats must be able to init and open | 1207 | # supported formats must be able to init and open |
| 944 | 1209 | t = get_transport(self.get_url()) | 1208 | t = transport.get_transport(self.get_url()) |
| 945 | 1210 | readonly_t = get_transport(self.get_readonly_url()) | 1209 | readonly_t = transport.get_transport(self.get_readonly_url()) |
| 946 | 1211 | made_control = self.bzrdir_format.initialize(t.base) | 1210 | made_control = self.bzrdir_format.initialize(t.base) |
| 947 | 1212 | self.failUnless(isinstance(made_control, bzrdir.BzrDir)) | 1211 | self.failUnless(isinstance(made_control, bzrdir.BzrDir)) |
| 948 | 1213 | self.assertEqual(self.bzrdir_format, | 1212 | self.assertEqual(self.bzrdir_format, |
| 949 | @@ -1417,7 +1416,7 @@ | |||
| 950 | 1417 | # test the formats specific behaviour for no-content or similar dirs. | 1416 | # test the formats specific behaviour for no-content or similar dirs. |
| 951 | 1418 | self.assertRaises(NotBranchError, | 1417 | self.assertRaises(NotBranchError, |
| 952 | 1419 | self.bzrdir_format.open, | 1418 | self.bzrdir_format.open, |
| 954 | 1420 | get_transport(self.get_readonly_url())) | 1419 | transport.get_transport(self.get_readonly_url())) |
| 955 | 1421 | 1420 | ||
| 956 | 1422 | def test_create_branch(self): | 1421 | def test_create_branch(self): |
| 957 | 1423 | # a bzrdir can construct a branch and repository for itself. | 1422 | # a bzrdir can construct a branch and repository for itself. |
| 958 | @@ -1426,7 +1425,7 @@ | |||
| 959 | 1426 | # because the default open will not open them and | 1425 | # because the default open will not open them and |
| 960 | 1427 | # they may not be initializable. | 1426 | # they may not be initializable. |
| 961 | 1428 | return | 1427 | return |
| 963 | 1429 | t = get_transport(self.get_url()) | 1428 | t = transport.get_transport(self.get_url()) |
| 964 | 1430 | made_control = self.bzrdir_format.initialize(t.base) | 1429 | made_control = self.bzrdir_format.initialize(t.base) |
| 965 | 1431 | made_repo = made_control.create_repository() | 1430 | made_repo = made_control.create_repository() |
| 966 | 1432 | made_branch = made_control.create_branch() | 1431 | made_branch = made_control.create_branch() |
| 967 | @@ -1439,7 +1438,7 @@ | |||
| 968 | 1439 | # because the default open will not open them and | 1438 | # because the default open will not open them and |
| 969 | 1440 | # they may not be initializable. | 1439 | # they may not be initializable. |
| 970 | 1441 | return | 1440 | return |
| 972 | 1442 | t = get_transport(self.get_url()) | 1441 | t = transport.get_transport(self.get_url()) |
| 973 | 1443 | made_control = self.bzrdir_format.initialize(t.base) | 1442 | made_control = self.bzrdir_format.initialize(t.base) |
| 974 | 1444 | made_repo = made_control.create_repository() | 1443 | made_repo = made_control.create_repository() |
| 975 | 1445 | made_branch = made_control.create_branch() | 1444 | made_branch = made_control.create_branch() |
| 976 | @@ -1454,7 +1453,7 @@ | |||
| 977 | 1454 | # because the default open will not open them and | 1453 | # because the default open will not open them and |
| 978 | 1455 | # they may not be initializable. | 1454 | # they may not be initializable. |
| 979 | 1456 | return | 1455 | return |
| 981 | 1457 | t = get_transport(self.get_url()) | 1456 | t = transport.get_transport(self.get_url()) |
| 982 | 1458 | made_control = self.bzrdir_format.initialize(t.base) | 1457 | made_control = self.bzrdir_format.initialize(t.base) |
| 983 | 1459 | made_repo = made_control.create_repository() | 1458 | made_repo = made_control.create_repository() |
| 984 | 1460 | made_branch = made_control.create_branch() | 1459 | made_branch = made_control.create_branch() |
| 985 | @@ -1475,7 +1474,7 @@ | |||
| 986 | 1475 | # because the default open will not open them and | 1474 | # because the default open will not open them and |
| 987 | 1476 | # they may not be initializable. | 1475 | # they may not be initializable. |
| 988 | 1477 | return | 1476 | return |
| 990 | 1478 | t = get_transport(self.get_url()) | 1477 | t = transport.get_transport(self.get_url()) |
| 991 | 1479 | made_control = self.bzrdir_format.initialize(t.base) | 1478 | made_control = self.bzrdir_format.initialize(t.base) |
| 992 | 1480 | made_repo = made_control.create_repository() | 1479 | made_repo = made_control.create_repository() |
| 993 | 1481 | # Check that we have a repository object. | 1480 | # Check that we have a repository object. |
| 994 | @@ -1490,7 +1489,7 @@ | |||
| 995 | 1490 | # because the default open will not open them and | 1489 | # because the default open will not open them and |
| 996 | 1491 | # they may not be initializable. | 1490 | # they may not be initializable. |
| 997 | 1492 | return | 1491 | return |
| 999 | 1493 | t = get_transport(self.get_url()) | 1492 | t = transport.get_transport(self.get_url()) |
| 1000 | 1494 | made_control = self.bzrdir_format.initialize(t.base) | 1493 | made_control = self.bzrdir_format.initialize(t.base) |
| 1001 | 1495 | try: | 1494 | try: |
| 1002 | 1496 | made_repo = made_control.create_repository(shared=True) | 1495 | made_repo = made_control.create_repository(shared=True) |
| 1003 | @@ -1507,7 +1506,7 @@ | |||
| 1004 | 1507 | # because the default open will not open them and | 1506 | # because the default open will not open them and |
| 1005 | 1508 | # they may not be initializable. | 1507 | # they may not be initializable. |
| 1006 | 1509 | return | 1508 | return |
| 1008 | 1510 | t = get_transport(self.get_url()) | 1509 | t = transport.get_transport(self.get_url()) |
| 1009 | 1511 | made_control = self.bzrdir_format.initialize(t.base) | 1510 | made_control = self.bzrdir_format.initialize(t.base) |
| 1010 | 1512 | made_repo = made_control.create_repository(shared=False) | 1511 | made_repo = made_control.create_repository(shared=False) |
| 1011 | 1513 | self.assertFalse(made_repo.is_shared()) | 1512 | self.assertFalse(made_repo.is_shared()) |
| 1012 | @@ -1518,7 +1517,7 @@ | |||
| 1013 | 1518 | # because the default open will not open them and | 1517 | # because the default open will not open them and |
| 1014 | 1519 | # they may not be initializable. | 1518 | # they may not be initializable. |
| 1015 | 1520 | return | 1519 | return |
| 1017 | 1521 | t = get_transport(self.get_url()) | 1520 | t = transport.get_transport(self.get_url()) |
| 1018 | 1522 | made_control = self.bzrdir_format.initialize(t.base) | 1521 | made_control = self.bzrdir_format.initialize(t.base) |
| 1019 | 1523 | made_repo = made_control.create_repository() | 1522 | made_repo = made_control.create_repository() |
| 1020 | 1524 | opened_repo = made_control.open_repository() | 1523 | opened_repo = made_control.open_repository() |
| 1021 | @@ -1646,7 +1645,7 @@ | |||
| 1022 | 1646 | def test_root_transport(self): | 1645 | def test_root_transport(self): |
| 1023 | 1647 | dir = self.make_bzrdir('.') | 1646 | dir = self.make_bzrdir('.') |
| 1024 | 1648 | self.assertEqual(dir.root_transport.base, | 1647 | self.assertEqual(dir.root_transport.base, |
| 1026 | 1649 | get_transport(self.get_url('.')).base) | 1648 | transport.get_transport(self.get_url('.')).base) |
| 1027 | 1650 | 1649 | ||
| 1028 | 1651 | def test_find_repository_no_repo_under_standalone_branch(self): | 1650 | def test_find_repository_no_repo_under_standalone_branch(self): |
| 1029 | 1652 | # finding a repo stops at standalone branches even if there is a | 1651 | # finding a repo stops at standalone branches even if there is a |
| 1030 | @@ -1657,8 +1656,8 @@ | |||
| 1031 | 1657 | # need a shared repository to test this. | 1656 | # need a shared repository to test this. |
| 1032 | 1658 | return | 1657 | return |
| 1033 | 1659 | url = self.get_url('intermediate') | 1658 | url = self.get_url('intermediate') |
| 1036 | 1660 | get_transport(self.get_url()).mkdir('intermediate') | 1659 | transport.get_transport(self.get_url()).mkdir('intermediate') |
| 1037 | 1661 | get_transport(self.get_url()).mkdir('intermediate/child') | 1660 | transport.get_transport(self.get_url()).mkdir('intermediate/child') |
| 1038 | 1662 | made_control = self.bzrdir_format.initialize(url) | 1661 | made_control = self.bzrdir_format.initialize(url) |
| 1039 | 1663 | made_control.create_repository() | 1662 | made_control.create_repository() |
| 1040 | 1664 | innermost_control = self.bzrdir_format.initialize( | 1663 | innermost_control = self.bzrdir_format.initialize( |
| 1041 | @@ -1682,7 +1681,7 @@ | |||
| 1042 | 1682 | # need a shared repository to test this. | 1681 | # need a shared repository to test this. |
| 1043 | 1683 | return | 1682 | return |
| 1044 | 1684 | url = self.get_url('childbzrdir') | 1683 | url = self.get_url('childbzrdir') |
| 1046 | 1685 | get_transport(self.get_url()).mkdir('childbzrdir') | 1684 | transport.get_transport(self.get_url()).mkdir('childbzrdir') |
| 1047 | 1686 | made_control = self.bzrdir_format.initialize(url) | 1685 | made_control = self.bzrdir_format.initialize(url) |
| 1048 | 1687 | try: | 1686 | try: |
| 1049 | 1688 | child_repo = made_control.open_repository() | 1687 | child_repo = made_control.open_repository() |
| 1050 | @@ -1716,7 +1715,7 @@ | |||
| 1051 | 1716 | # need a shared repository to test this. | 1715 | # need a shared repository to test this. |
| 1052 | 1717 | return | 1716 | return |
| 1053 | 1718 | url = self.get_url('childrepo') | 1717 | url = self.get_url('childrepo') |
| 1055 | 1719 | get_transport(self.get_url()).mkdir('childrepo') | 1718 | transport.get_transport(self.get_url()).mkdir('childrepo') |
| 1056 | 1720 | child_control = self.bzrdir_format.initialize(url) | 1719 | child_control = self.bzrdir_format.initialize(url) |
| 1057 | 1721 | child_repo = child_control.create_repository(shared=True) | 1720 | child_repo = child_control.create_repository(shared=True) |
| 1058 | 1722 | opened_control = bzrdir.BzrDir.open(self.get_url('childrepo')) | 1721 | opened_control = bzrdir.BzrDir.open(self.get_url('childrepo')) |
| 1059 | @@ -1735,8 +1734,8 @@ | |||
| 1060 | 1735 | # need a shared repository to test this. | 1734 | # need a shared repository to test this. |
| 1061 | 1736 | return | 1735 | return |
| 1062 | 1737 | url = self.get_url('intermediate') | 1736 | url = self.get_url('intermediate') |
| 1065 | 1738 | get_transport(self.get_url()).mkdir('intermediate') | 1737 | transport.get_transport(self.get_url()).mkdir('intermediate') |
| 1066 | 1739 | get_transport(self.get_url()).mkdir('intermediate/child') | 1738 | transport.get_transport(self.get_url()).mkdir('intermediate/child') |
| 1067 | 1740 | made_control = self.bzrdir_format.initialize(url) | 1739 | made_control = self.bzrdir_format.initialize(url) |
| 1068 | 1741 | try: | 1740 | try: |
| 1069 | 1742 | child_repo = made_control.open_repository() | 1741 | child_repo = made_control.open_repository() |
| 1070 | @@ -1981,7 +1980,7 @@ | |||
| 1071 | 1981 | # - do the vfs initialisation over the basic vfs transport | 1980 | # - do the vfs initialisation over the basic vfs transport |
| 1072 | 1982 | # XXX: TODO this should become a 'bzrdirlocation' api call. | 1981 | # XXX: TODO this should become a 'bzrdirlocation' api call. |
| 1073 | 1983 | url = self.get_vfs_only_url('subdir') | 1982 | url = self.get_vfs_only_url('subdir') |
| 1075 | 1984 | get_transport(self.get_vfs_only_url()).mkdir('subdir') | 1983 | transport.get_transport(self.get_vfs_only_url()).mkdir('subdir') |
| 1076 | 1985 | made_control = self.bzrdir_format.initialize(self.get_url('subdir')) | 1984 | made_control = self.bzrdir_format.initialize(self.get_url('subdir')) |
| 1077 | 1986 | try: | 1985 | try: |
| 1078 | 1987 | repo = made_control.open_repository() | 1986 | repo = made_control.open_repository() |
| 1079 | @@ -1997,7 +1996,7 @@ | |||
| 1080 | 1997 | 1996 | ||
| 1081 | 1998 | class TestBzrDirControlComponent(TestCaseWithBzrDir): | 1997 | class TestBzrDirControlComponent(TestCaseWithBzrDir): |
| 1082 | 1999 | """BzrDir implementations adequately implement ControlComponent.""" | 1998 | """BzrDir implementations adequately implement ControlComponent.""" |
| 1084 | 2000 | 1999 | ||
| 1085 | 2001 | def test_urls(self): | 2000 | def test_urls(self): |
| 1086 | 2002 | bd = self.make_bzrdir('bd') | 2001 | bd = self.make_bzrdir('bd') |
| 1087 | 2003 | self.assertIsInstance(bd.user_url, str) | 2002 | self.assertIsInstance(bd.user_url, str) |
| 1088 | 2004 | 2003 | ||
| 1089 | === modified file 'bzrlib/tests/per_interbranch/__init__.py' | |||
| 1090 | --- bzrlib/tests/per_interbranch/__init__.py 2010-06-16 08:17:50 +0000 | |||
| 1091 | +++ bzrlib/tests/per_interbranch/__init__.py 2010-06-29 17:48:31 +0000 | |||
| 1092 | @@ -1,4 +1,4 @@ | |||
| 1094 | 1 | # Copyright (C) 2009 Canonical Ltd | 1 | # Copyright (C) 2009, 2010 Canonical Ltd |
| 1095 | 2 | # -*- coding: utf-8 -*- | 2 | # -*- coding: utf-8 -*- |
| 1096 | 3 | # | 3 | # |
| 1097 | 4 | # This program is free software; you can redistribute it and/or modify | 4 | # This program is free software; you can redistribute it and/or modify |
| 1098 | @@ -46,7 +46,6 @@ | |||
| 1099 | 46 | TestCaseWithTransport, | 46 | TestCaseWithTransport, |
| 1100 | 47 | multiply_tests, | 47 | multiply_tests, |
| 1101 | 48 | ) | 48 | ) |
| 1102 | 49 | from bzrlib.transport import get_transport | ||
| 1103 | 50 | 49 | ||
| 1104 | 51 | 50 | ||
| 1105 | 52 | def make_scenarios(test_list): | 51 | def make_scenarios(test_list): |
| 1106 | 53 | 52 | ||
| 1107 | === modified file 'bzrlib/tests/per_interbranch/test_pull.py' | |||
| 1108 | --- bzrlib/tests/per_interbranch/test_pull.py 2010-06-14 06:37:11 +0000 | |||
| 1109 | +++ bzrlib/tests/per_interbranch/test_pull.py 2010-06-29 17:48:31 +0000 | |||
| 1110 | @@ -1,4 +1,4 @@ | |||
| 1112 | 1 | # Copyright (C) 2004, 2005, 2007, 2009 Canonical Ltd | 1 | # Copyright (C) 2009, 2010 Canonical Ltd |
| 1113 | 2 | # | 2 | # |
| 1114 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 1115 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 1116 | 5 | 5 | ||
| 1117 | === modified file 'bzrlib/tests/per_interbranch/test_push.py' | |||
| 1118 | --- bzrlib/tests/per_interbranch/test_push.py 2010-06-24 08:16:36 +0000 | |||
| 1119 | +++ bzrlib/tests/per_interbranch/test_push.py 2010-06-29 17:48:31 +0000 | |||
| 1120 | @@ -44,7 +44,6 @@ | |||
| 1121 | 44 | from bzrlib.tests.per_interbranch import ( | 44 | from bzrlib.tests.per_interbranch import ( |
| 1122 | 45 | TestCaseWithInterBranch, | 45 | TestCaseWithInterBranch, |
| 1123 | 46 | ) | 46 | ) |
| 1124 | 47 | from bzrlib.transport import get_transport | ||
| 1125 | 48 | from bzrlib.tests import test_server | 47 | from bzrlib.tests import test_server |
| 1126 | 49 | 48 | ||
| 1127 | 50 | 49 | ||
| 1128 | 51 | 50 | ||
| 1129 | === modified file 'bzrlib/tests/per_interbranch/test_update_revisions.py' | |||
| 1130 | --- bzrlib/tests/per_interbranch/test_update_revisions.py 2010-06-17 06:30:22 +0000 | |||
| 1131 | +++ bzrlib/tests/per_interbranch/test_update_revisions.py 2010-06-29 17:48:31 +0000 | |||
| 1132 | @@ -1,4 +1,4 @@ | |||
| 1134 | 1 | # Copyright (C) 2009 Canonical Ltd | 1 | # Copyright (C) 2009, 2010 Canonical Ltd |
| 1135 | 2 | # | 2 | # |
| 1136 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 1137 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 1138 | 5 | 5 | ||
| 1139 | === modified file 'bzrlib/tests/per_interrepository/__init__.py' | |||
| 1140 | --- bzrlib/tests/per_interrepository/__init__.py 2009-08-14 01:07:44 +0000 | |||
| 1141 | +++ bzrlib/tests/per_interrepository/__init__.py 2010-06-29 17:48:31 +0000 | |||
| 1142 | @@ -1,4 +1,4 @@ | |||
| 1144 | 1 | # Copyright (C) 2006 Canonical Ltd | 1 | # Copyright (C) 2006-2010 Canonical Ltd |
| 1145 | 2 | # Authors: Robert Collins <robert.collins@canonical.com> | 2 | # Authors: Robert Collins <robert.collins@canonical.com> |
| 1146 | 3 | # -*- coding: utf-8 -*- | 3 | # -*- coding: utf-8 -*- |
| 1147 | 4 | # | 4 | # |
| 1148 | @@ -26,6 +26,7 @@ | |||
| 1149 | 26 | """ | 26 | """ |
| 1150 | 27 | 27 | ||
| 1151 | 28 | 28 | ||
| 1152 | 29 | from bzrlib import transport | ||
| 1153 | 29 | from bzrlib.errors import ( | 30 | from bzrlib.errors import ( |
| 1154 | 30 | FileExists, | 31 | FileExists, |
| 1155 | 31 | UninitializableFormat, | 32 | UninitializableFormat, |
| 1156 | @@ -39,7 +40,6 @@ | |||
| 1157 | 39 | multiply_tests, | 40 | multiply_tests, |
| 1158 | 40 | ) | 41 | ) |
| 1159 | 41 | from bzrlib.tests.per_bzrdir.test_bzrdir import TestCaseWithBzrDir | 42 | from bzrlib.tests.per_bzrdir.test_bzrdir import TestCaseWithBzrDir |
| 1160 | 42 | from bzrlib.transport import get_transport | ||
| 1161 | 43 | 43 | ||
| 1162 | 44 | 44 | ||
| 1163 | 45 | def make_scenarios(transport_server, transport_readonly_server, formats): | 45 | def make_scenarios(transport_server, transport_readonly_server, formats): |
| 1164 | @@ -143,7 +143,7 @@ | |||
| 1165 | 143 | segments = url.split('/') | 143 | segments = url.split('/') |
| 1166 | 144 | if segments and segments[-1] not in ('', '.'): | 144 | if segments and segments[-1] not in ('', '.'): |
| 1167 | 145 | parent = '/'.join(segments[:-1]) | 145 | parent = '/'.join(segments[:-1]) |
| 1169 | 146 | t = get_transport(parent) | 146 | t = transport.get_transport(parent) |
| 1170 | 147 | try: | 147 | try: |
| 1171 | 148 | t.mkdir(segments[-1]) | 148 | t.mkdir(segments[-1]) |
| 1172 | 149 | except FileExists: | 149 | except FileExists: |
| 1173 | 150 | 150 | ||
| 1174 | === modified file 'bzrlib/tests/per_intertree/__init__.py' | |||
| 1175 | --- bzrlib/tests/per_intertree/__init__.py 2010-02-17 17:11:16 +0000 | |||
| 1176 | +++ bzrlib/tests/per_intertree/__init__.py 2010-06-29 17:48:31 +0000 | |||
| 1177 | @@ -28,7 +28,6 @@ | |||
| 1178 | 28 | revisiontree, | 28 | revisiontree, |
| 1179 | 29 | tests, | 29 | tests, |
| 1180 | 30 | ) | 30 | ) |
| 1181 | 31 | from bzrlib.transport import get_transport | ||
| 1182 | 32 | from bzrlib.transform import TransformPreview | 31 | from bzrlib.transform import TransformPreview |
| 1183 | 33 | from bzrlib.tests import ( | 32 | from bzrlib.tests import ( |
| 1184 | 34 | default_transport, | 33 | default_transport, |
| 1185 | 35 | 34 | ||
| 1186 | === modified file 'bzrlib/tests/per_repository/test_fetch.py' | |||
| 1187 | --- bzrlib/tests/per_repository/test_fetch.py 2009-08-05 02:12:22 +0000 | |||
| 1188 | +++ bzrlib/tests/per_repository/test_fetch.py 2010-06-29 17:48:31 +0000 | |||
| 1189 | @@ -1,4 +1,4 @@ | |||
| 1191 | 1 | # Copyright (C) 2007 Canonical Ltd | 1 | # Copyright (C) 2007-2010 Canonical Ltd |
| 1192 | 2 | # | 2 | # |
| 1193 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 1194 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 1195 | @@ -28,7 +28,6 @@ | |||
| 1196 | 28 | from bzrlib.inventory import ROOT_ID | 28 | from bzrlib.inventory import ROOT_ID |
| 1197 | 29 | from bzrlib.tests import TestSkipped | 29 | from bzrlib.tests import TestSkipped |
| 1198 | 30 | from bzrlib.tests.per_repository import TestCaseWithRepository | 30 | from bzrlib.tests.per_repository import TestCaseWithRepository |
| 1199 | 31 | from bzrlib.transport import get_transport | ||
| 1200 | 32 | 31 | ||
| 1201 | 33 | 32 | ||
| 1202 | 34 | class TestFetchSameRepository(TestCaseWithRepository): | 33 | class TestFetchSameRepository(TestCaseWithRepository): |
| 1203 | 35 | 34 | ||
| 1204 | === modified file 'bzrlib/tests/per_repository/test_has_same_location.py' | |||
| 1205 | --- bzrlib/tests/per_repository/test_has_same_location.py 2009-03-23 14:59:43 +0000 | |||
| 1206 | +++ bzrlib/tests/per_repository/test_has_same_location.py 2010-06-29 17:48:31 +0000 | |||
| 1207 | @@ -1,4 +1,4 @@ | |||
| 1209 | 1 | # Copyright (C) 2007, 2008 Canonical Ltd | 1 | # Copyright (C) 2007-2010 Canonical Ltd |
| 1210 | 2 | # | 2 | # |
| 1211 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 1212 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 1213 | @@ -16,12 +16,14 @@ | |||
| 1214 | 16 | 16 | ||
| 1215 | 17 | """Tests for implementations of Repository.has_same_location.""" | 17 | """Tests for implementations of Repository.has_same_location.""" |
| 1216 | 18 | 18 | ||
| 1218 | 19 | from bzrlib import bzrdir | 19 | from bzrlib import ( |
| 1219 | 20 | bzrdir, | ||
| 1220 | 21 | transport, | ||
| 1221 | 22 | ) | ||
| 1222 | 20 | from bzrlib.tests import ( | 23 | from bzrlib.tests import ( |
| 1223 | 21 | TestNotApplicable, | 24 | TestNotApplicable, |
| 1224 | 22 | ) | 25 | ) |
| 1225 | 23 | from bzrlib.tests.per_repository import TestCaseWithRepository | 26 | from bzrlib.tests.per_repository import TestCaseWithRepository |
| 1226 | 24 | from bzrlib.transport import get_transport | ||
| 1227 | 25 | 27 | ||
| 1228 | 26 | 28 | ||
| 1229 | 27 | class TestHasSameLocation(TestCaseWithRepository): | 29 | class TestHasSameLocation(TestCaseWithRepository): |
| 1230 | @@ -112,7 +114,8 @@ | |||
| 1231 | 112 | if repo._format == other_repo._format: | 114 | if repo._format == other_repo._format: |
| 1232 | 113 | # We're testing the default format! So we have to use a non-default | 115 | # We're testing the default format! So we have to use a non-default |
| 1233 | 114 | # format for other_repo. | 116 | # format for other_repo. |
| 1235 | 115 | get_transport(self.get_vfs_only_url()).delete_tree('other') | 117 | transport.get_transport(self.get_vfs_only_url() |
| 1236 | 118 | ).delete_tree('other') | ||
| 1237 | 116 | other_repo = self.make_repository('other', format='metaweave') | 119 | other_repo = self.make_repository('other', format='metaweave') |
| 1238 | 117 | # Make sure the other_repo is not a RemoteRepository. | 120 | # Make sure the other_repo is not a RemoteRepository. |
| 1239 | 118 | other_bzrdir = bzrdir.BzrDir.open(self.get_vfs_only_url('other')) | 121 | other_bzrdir = bzrdir.BzrDir.open(self.get_vfs_only_url('other')) |
| 1240 | 119 | 122 | ||
| 1241 | === modified file 'bzrlib/tests/per_repository/test_reconcile.py' | |||
| 1242 | --- bzrlib/tests/per_repository/test_reconcile.py 2009-09-08 11:32:53 +0000 | |||
| 1243 | +++ bzrlib/tests/per_repository/test_reconcile.py 2010-06-29 17:48:31 +0000 | |||
| 1244 | @@ -1,4 +1,4 @@ | |||
| 1246 | 1 | # Copyright (C) 2006 Canonical Ltd | 1 | # Copyright (C) 2006-2010 Canonical Ltd |
| 1247 | 2 | # | 2 | # |
| 1248 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 1249 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 1250 | @@ -18,7 +18,10 @@ | |||
| 1251 | 18 | 18 | ||
| 1252 | 19 | 19 | ||
| 1253 | 20 | import bzrlib | 20 | import bzrlib |
| 1255 | 21 | import bzrlib.errors as errors | 21 | from bzrlib import ( |
| 1256 | 22 | errors, | ||
| 1257 | 23 | transport, | ||
| 1258 | 24 | ) | ||
| 1259 | 22 | from bzrlib.inventory import Inventory | 25 | from bzrlib.inventory import Inventory |
| 1260 | 23 | from bzrlib.reconcile import reconcile, Reconciler | 26 | from bzrlib.reconcile import reconcile, Reconciler |
| 1261 | 24 | from bzrlib.repofmt.knitrepo import RepositoryFormatKnit | 27 | from bzrlib.repofmt.knitrepo import RepositoryFormatKnit |
| 1262 | @@ -30,7 +33,6 @@ | |||
| 1263 | 30 | from bzrlib.tests.per_repository import ( | 33 | from bzrlib.tests.per_repository import ( |
| 1264 | 31 | TestCaseWithRepository, | 34 | TestCaseWithRepository, |
| 1265 | 32 | ) | 35 | ) |
| 1266 | 33 | from bzrlib.transport import get_transport | ||
| 1267 | 34 | from bzrlib.uncommit import uncommit | 36 | from bzrlib.uncommit import uncommit |
| 1268 | 35 | 37 | ||
| 1269 | 36 | 38 | ||
| 1270 | @@ -59,7 +61,7 @@ | |||
| 1271 | 59 | def setUp(self): | 61 | def setUp(self): |
| 1272 | 60 | super(TestsNeedingReweave, self).setUp() | 62 | super(TestsNeedingReweave, self).setUp() |
| 1273 | 61 | 63 | ||
| 1275 | 62 | t = get_transport(self.get_url()) | 64 | t = transport.get_transport(self.get_url()) |
| 1276 | 63 | # an empty inventory with no revision for testing with. | 65 | # an empty inventory with no revision for testing with. |
| 1277 | 64 | repo = self.make_repository('inventory_without_revision') | 66 | repo = self.make_repository('inventory_without_revision') |
| 1278 | 65 | repo.lock_write() | 67 | repo.lock_write() |
| 1279 | @@ -310,7 +312,7 @@ | |||
| 1280 | 310 | self.reduceLockdirTimeout() | 312 | self.reduceLockdirTimeout() |
| 1281 | 311 | super(TestReconcileWithIncorrectRevisionCache, self).setUp() | 313 | super(TestReconcileWithIncorrectRevisionCache, self).setUp() |
| 1282 | 312 | 314 | ||
| 1284 | 313 | t = get_transport(self.get_url()) | 315 | t = transport.get_transport(self.get_url()) |
| 1285 | 314 | # we need a revision with two parents in the wrong order | 316 | # we need a revision with two parents in the wrong order |
| 1286 | 315 | # which should trigger reinsertion. | 317 | # which should trigger reinsertion. |
| 1287 | 316 | # and another with the first one correct but the other two not | 318 | # and another with the first one correct but the other two not |
| 1288 | @@ -379,7 +381,7 @@ | |||
| 1289 | 379 | 381 | ||
| 1290 | 380 | def test_reconcile_wrong_order(self): | 382 | def test_reconcile_wrong_order(self): |
| 1291 | 381 | # a wrong order in primary parents is optionally correctable | 383 | # a wrong order in primary parents is optionally correctable |
| 1293 | 382 | t = get_transport(self.get_url()).clone('wrong-first-parent') | 384 | t = transport.get_transport(self.get_url()).clone('wrong-first-parent') |
| 1294 | 383 | d = bzrlib.bzrdir.BzrDir.open_from_transport(t) | 385 | d = bzrlib.bzrdir.BzrDir.open_from_transport(t) |
| 1295 | 384 | repo = d.open_repository() | 386 | repo = d.open_repository() |
| 1296 | 385 | repo.lock_read() | 387 | repo.lock_read() |
| 1297 | @@ -408,7 +410,8 @@ | |||
| 1298 | 408 | 410 | ||
| 1299 | 409 | def test_reconcile_wrong_order_secondary_inventory(self): | 411 | def test_reconcile_wrong_order_secondary_inventory(self): |
| 1300 | 410 | # a wrong order in the parents for inventories is ignored. | 412 | # a wrong order in the parents for inventories is ignored. |
| 1302 | 411 | t = get_transport(self.get_url()).clone('reversed-secondary-parents') | 413 | t = transport.get_transport(self.get_url() |
| 1303 | 414 | ).clone('reversed-secondary-parents') | ||
| 1304 | 412 | d = bzrlib.bzrdir.BzrDir.open_from_transport(t) | 415 | d = bzrlib.bzrdir.BzrDir.open_from_transport(t) |
| 1305 | 413 | repo = d.open_repository() | 416 | repo = d.open_repository() |
| 1306 | 414 | self.checkUnreconciled(d, repo.reconcile()) | 417 | self.checkUnreconciled(d, repo.reconcile()) |
| 1307 | 415 | 418 | ||
| 1308 | === modified file 'bzrlib/tests/per_versionedfile.py' | |||
| 1309 | --- bzrlib/tests/per_versionedfile.py 2010-05-14 14:29:28 +0000 | |||
| 1310 | +++ bzrlib/tests/per_versionedfile.py 2010-06-29 17:48:31 +0000 | |||
| 1311 | @@ -31,6 +31,7 @@ | |||
| 1312 | 31 | knit as _mod_knit, | 31 | knit as _mod_knit, |
| 1313 | 32 | osutils, | 32 | osutils, |
| 1314 | 33 | progress, | 33 | progress, |
| 1315 | 34 | transport, | ||
| 1316 | 34 | ui, | 35 | ui, |
| 1317 | 35 | ) | 36 | ) |
| 1318 | 36 | from bzrlib.errors import ( | 37 | from bzrlib.errors import ( |
| 1319 | @@ -56,7 +57,6 @@ | |||
| 1320 | 56 | ) | 57 | ) |
| 1321 | 57 | from bzrlib.tests.http_utils import TestCaseWithWebserver | 58 | from bzrlib.tests.http_utils import TestCaseWithWebserver |
| 1322 | 58 | from bzrlib.trace import mutter | 59 | from bzrlib.trace import mutter |
| 1323 | 59 | from bzrlib.transport import get_transport | ||
| 1324 | 60 | from bzrlib.transport.memory import MemoryTransport | 60 | from bzrlib.transport.memory import MemoryTransport |
| 1325 | 61 | from bzrlib.tsort import topo_sort | 61 | from bzrlib.tsort import topo_sort |
| 1326 | 62 | from bzrlib.tuned_gzip import GzipFile | 62 | from bzrlib.tuned_gzip import GzipFile |
| 1327 | @@ -849,10 +849,10 @@ | |||
| 1328 | 849 | self.assertEquals(('references_ghost', 'line_c\n'), origins[2]) | 849 | self.assertEquals(('references_ghost', 'line_c\n'), origins[2]) |
| 1329 | 850 | 850 | ||
| 1330 | 851 | def test_readonly_mode(self): | 851 | def test_readonly_mode(self): |
| 1332 | 852 | transport = get_transport(self.get_url('.')) | 852 | t = transport.get_transport(self.get_url('.')) |
| 1333 | 853 | factory = self.get_factory() | 853 | factory = self.get_factory() |
| 1336 | 854 | vf = factory('id', transport, 0777, create=True, access_mode='w') | 854 | vf = factory('id', t, 0777, create=True, access_mode='w') |
| 1337 | 855 | vf = factory('id', transport, access_mode='r') | 855 | vf = factory('id', t, access_mode='r') |
| 1338 | 856 | self.assertRaises(errors.ReadOnlyError, vf.add_lines, 'base', [], []) | 856 | self.assertRaises(errors.ReadOnlyError, vf.add_lines, 'base', [], []) |
| 1339 | 857 | self.assertRaises(errors.ReadOnlyError, | 857 | self.assertRaises(errors.ReadOnlyError, |
| 1340 | 858 | vf.add_lines_with_ghosts, | 858 | vf.add_lines_with_ghosts, |
| 1341 | @@ -880,12 +880,14 @@ | |||
| 1342 | 880 | class TestWeave(TestCaseWithMemoryTransport, VersionedFileTestMixIn): | 880 | class TestWeave(TestCaseWithMemoryTransport, VersionedFileTestMixIn): |
| 1343 | 881 | 881 | ||
| 1344 | 882 | def get_file(self, name='foo'): | 882 | def get_file(self, name='foo'): |
| 1347 | 883 | return WeaveFile(name, get_transport(self.get_url('.')), create=True, | 883 | return WeaveFile(name, transport.get_transport(self.get_url('.')), |
| 1348 | 884 | get_scope=self.get_transaction) | 884 | create=True, |
| 1349 | 885 | get_scope=self.get_transaction) | ||
| 1350 | 885 | 886 | ||
| 1351 | 886 | def get_file_corrupted_text(self): | 887 | def get_file_corrupted_text(self): |
| 1354 | 887 | w = WeaveFile('foo', get_transport(self.get_url('.')), create=True, | 888 | w = WeaveFile('foo', transport.get_transport(self.get_url('.')), |
| 1355 | 888 | get_scope=self.get_transaction) | 889 | create=True, |
| 1356 | 890 | get_scope=self.get_transaction) | ||
| 1357 | 889 | w.add_lines('v1', [], ['hello\n']) | 891 | w.add_lines('v1', [], ['hello\n']) |
| 1358 | 890 | w.add_lines('v2', ['v1'], ['hello\n', 'there\n']) | 892 | w.add_lines('v2', ['v1'], ['hello\n', 'there\n']) |
| 1359 | 891 | 893 | ||
| 1360 | @@ -919,14 +921,15 @@ | |||
| 1361 | 919 | return w | 921 | return w |
| 1362 | 920 | 922 | ||
| 1363 | 921 | def reopen_file(self, name='foo', create=False): | 923 | def reopen_file(self, name='foo', create=False): |
| 1366 | 922 | return WeaveFile(name, get_transport(self.get_url('.')), create=create, | 924 | return WeaveFile(name, transport.get_transport(self.get_url('.')), |
| 1367 | 923 | get_scope=self.get_transaction) | 925 | create=create, |
| 1368 | 926 | get_scope=self.get_transaction) | ||
| 1369 | 924 | 927 | ||
| 1370 | 925 | def test_no_implicit_create(self): | 928 | def test_no_implicit_create(self): |
| 1371 | 926 | self.assertRaises(errors.NoSuchFile, | 929 | self.assertRaises(errors.NoSuchFile, |
| 1372 | 927 | WeaveFile, | 930 | WeaveFile, |
| 1373 | 928 | 'foo', | 931 | 'foo', |
| 1375 | 929 | get_transport(self.get_url('.')), | 932 | transport.get_transport(self.get_url('.')), |
| 1376 | 930 | get_scope=self.get_transaction) | 933 | get_scope=self.get_transaction) |
| 1377 | 931 | 934 | ||
| 1378 | 932 | def get_factory(self): | 935 | def get_factory(self): |
| 1379 | @@ -999,7 +1002,7 @@ | |||
| 1380 | 999 | # we should be able to read from http with a versioned file. | 1002 | # we should be able to read from http with a versioned file. |
| 1381 | 1000 | vf = self.get_file() | 1003 | vf = self.get_file() |
| 1382 | 1001 | # try an empty file access | 1004 | # try an empty file access |
| 1384 | 1002 | readonly_vf = self.get_factory()('foo', get_transport( | 1005 | readonly_vf = self.get_factory()('foo', transport.get_transport( |
| 1385 | 1003 | self.get_readonly_url('.'))) | 1006 | self.get_readonly_url('.'))) |
| 1386 | 1004 | self.assertEqual([], readonly_vf.versions()) | 1007 | self.assertEqual([], readonly_vf.versions()) |
| 1387 | 1005 | 1008 | ||
| 1388 | @@ -1009,7 +1012,7 @@ | |||
| 1389 | 1009 | # now with feeling. | 1012 | # now with feeling. |
| 1390 | 1010 | vf.add_lines('1', [], ['a\n']) | 1013 | vf.add_lines('1', [], ['a\n']) |
| 1391 | 1011 | vf.add_lines('2', ['1'], ['b\n', 'a\n']) | 1014 | vf.add_lines('2', ['1'], ['b\n', 'a\n']) |
| 1393 | 1012 | readonly_vf = self.get_factory()('foo', get_transport( | 1015 | readonly_vf = self.get_factory()('foo', transport.get_transport( |
| 1394 | 1013 | self.get_readonly_url('.'))) | 1016 | self.get_readonly_url('.'))) |
| 1395 | 1014 | self.assertEqual(['1', '2'], vf.versions()) | 1017 | self.assertEqual(['1', '2'], vf.versions()) |
| 1396 | 1015 | self.assertEqual(['1', '2'], readonly_vf.versions()) | 1018 | self.assertEqual(['1', '2'], readonly_vf.versions()) |
| 1397 | @@ -1020,8 +1023,9 @@ | |||
| 1398 | 1020 | class TestWeaveHTTP(TestCaseWithWebserver, TestReadonlyHttpMixin): | 1023 | class TestWeaveHTTP(TestCaseWithWebserver, TestReadonlyHttpMixin): |
| 1399 | 1021 | 1024 | ||
| 1400 | 1022 | def get_file(self): | 1025 | def get_file(self): |
| 1403 | 1023 | return WeaveFile('foo', get_transport(self.get_url('.')), create=True, | 1026 | return WeaveFile('foo', transport.get_transport(self.get_url('.')), |
| 1404 | 1024 | get_scope=self.get_transaction) | 1027 | create=True, |
| 1405 | 1028 | get_scope=self.get_transaction) | ||
| 1406 | 1025 | 1029 | ||
| 1407 | 1026 | def get_factory(self): | 1030 | def get_factory(self): |
| 1408 | 1027 | return WeaveFile | 1031 | return WeaveFile |
| 1409 | @@ -1271,7 +1275,8 @@ | |||
| 1410 | 1271 | class TestWeaveMerge(TestCaseWithMemoryTransport, MergeCasesMixin): | 1275 | class TestWeaveMerge(TestCaseWithMemoryTransport, MergeCasesMixin): |
| 1411 | 1272 | 1276 | ||
| 1412 | 1273 | def get_file(self, name='foo'): | 1277 | def get_file(self, name='foo'): |
| 1414 | 1274 | return WeaveFile(name, get_transport(self.get_url('.')), create=True) | 1278 | return WeaveFile(name, transport.get_transport(self.get_url('.')), |
| 1415 | 1279 | create=True) | ||
| 1416 | 1275 | 1280 | ||
| 1417 | 1276 | def log_contents(self, w): | 1281 | def log_contents(self, w): |
| 1418 | 1277 | self.log('weave is:') | 1282 | self.log('weave is:') |
| 1419 | 1278 | 1283 | ||
| 1420 | === modified file 'bzrlib/tests/per_workingtree/test_pull.py' | |||
| 1421 | --- bzrlib/tests/per_workingtree/test_pull.py 2010-01-11 23:02:32 +0000 | |||
| 1422 | +++ bzrlib/tests/per_workingtree/test_pull.py 2010-06-29 17:48:31 +0000 | |||
| 1423 | @@ -23,7 +23,6 @@ | |||
| 1424 | 23 | from bzrlib.osutils import basename | 23 | from bzrlib.osutils import basename |
| 1425 | 24 | from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree | 24 | from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree |
| 1426 | 25 | from bzrlib.trace import mutter | 25 | from bzrlib.trace import mutter |
| 1427 | 26 | from bzrlib.transport import get_transport | ||
| 1428 | 27 | 26 | ||
| 1429 | 28 | 27 | ||
| 1430 | 29 | class TestPull(TestCaseWithWorkingTree): | 28 | class TestPull(TestCaseWithWorkingTree): |
| 1431 | 30 | 29 | ||
| 1432 | === modified file 'bzrlib/tests/test_btree_index.py' | |||
| 1433 | --- bzrlib/tests/test_btree_index.py 2010-03-25 17:09:53 +0000 | |||
| 1434 | +++ bzrlib/tests/test_btree_index.py 2010-06-29 17:48:31 +0000 | |||
| 1435 | @@ -27,6 +27,7 @@ | |||
| 1436 | 27 | lru_cache, | 27 | lru_cache, |
| 1437 | 28 | osutils, | 28 | osutils, |
| 1438 | 29 | tests, | 29 | tests, |
| 1439 | 30 | transport, | ||
| 1440 | 30 | ) | 31 | ) |
| 1441 | 31 | from bzrlib.tests import ( | 32 | from bzrlib.tests import ( |
| 1442 | 32 | TestCaseWithTransport, | 33 | TestCaseWithTransport, |
| 1443 | @@ -34,7 +35,6 @@ | |||
| 1444 | 34 | multiply_tests, | 35 | multiply_tests, |
| 1445 | 35 | split_suite_by_condition, | 36 | split_suite_by_condition, |
| 1446 | 36 | ) | 37 | ) |
| 1447 | 37 | from bzrlib.transport import get_transport | ||
| 1448 | 38 | 38 | ||
| 1449 | 39 | 39 | ||
| 1450 | 40 | def load_tests(standard_tests, module, loader): | 40 | def load_tests(standard_tests, module, loader): |
| 1451 | @@ -280,10 +280,10 @@ | |||
| 1452 | 280 | 280 | ||
| 1453 | 281 | for node in nodes: | 281 | for node in nodes: |
| 1454 | 282 | builder.add_node(*node) | 282 | builder.add_node(*node) |
| 1457 | 283 | transport = get_transport('trace+' + self.get_url('')) | 283 | t = transport.get_transport('trace+' + self.get_url('')) |
| 1458 | 284 | size = transport.put_file('index', self.time(builder.finish)) | 284 | size = t.put_file('index', self.time(builder.finish)) |
| 1459 | 285 | del builder | 285 | del builder |
| 1461 | 286 | index = btree_index.BTreeGraphIndex(transport, 'index', size) | 286 | index = btree_index.BTreeGraphIndex(t, 'index', size) |
| 1462 | 287 | # Seed the metadata, we're using internal calls now. | 287 | # Seed the metadata, we're using internal calls now. |
| 1463 | 288 | index.key_count() | 288 | index.key_count() |
| 1464 | 289 | self.assertEqual(3, len(index._row_lengths), | 289 | self.assertEqual(3, len(index._row_lengths), |
| 1465 | @@ -409,9 +409,9 @@ | |||
| 1466 | 409 | self.assertEqual(None, builder._backing_indices[2]) | 409 | self.assertEqual(None, builder._backing_indices[2]) |
| 1467 | 410 | self.assertEqual(16, builder._backing_indices[3].key_count()) | 410 | self.assertEqual(16, builder._backing_indices[3].key_count()) |
| 1468 | 411 | # Now finish, and check we got a correctly ordered tree | 411 | # Now finish, and check we got a correctly ordered tree |
| 1472 | 412 | transport = self.get_transport('') | 412 | t = self.get_transport('') |
| 1473 | 413 | size = transport.put_file('index', builder.finish()) | 413 | size = t.put_file('index', builder.finish()) |
| 1474 | 414 | index = btree_index.BTreeGraphIndex(transport, 'index', size) | 414 | index = btree_index.BTreeGraphIndex(t, 'index', size) |
| 1475 | 415 | nodes = list(index.iter_all_entries()) | 415 | nodes = list(index.iter_all_entries()) |
| 1476 | 416 | self.assertEqual(sorted(nodes), nodes) | 416 | self.assertEqual(sorted(nodes), nodes) |
| 1477 | 417 | self.assertEqual(16, len(nodes)) | 417 | self.assertEqual(16, len(nodes)) |
| 1478 | @@ -607,7 +607,7 @@ | |||
| 1479 | 607 | for key, value, references in nodes: | 607 | for key, value, references in nodes: |
| 1480 | 608 | builder.add_node(key, value, references) | 608 | builder.add_node(key, value, references) |
| 1481 | 609 | stream = builder.finish() | 609 | stream = builder.finish() |
| 1483 | 610 | trans = get_transport('trace+' + self.get_url()) | 610 | trans = transport.get_transport('trace+' + self.get_url()) |
| 1484 | 611 | size = trans.put_file('index', stream) | 611 | size = trans.put_file('index', stream) |
| 1485 | 612 | return btree_index.BTreeGraphIndex(trans, 'index', size) | 612 | return btree_index.BTreeGraphIndex(trans, 'index', size) |
| 1486 | 613 | 613 | ||
| 1487 | @@ -648,57 +648,57 @@ | |||
| 1488 | 648 | self.assertEqual(0, len(index._leaf_node_cache)) | 648 | self.assertEqual(0, len(index._leaf_node_cache)) |
| 1489 | 649 | 649 | ||
| 1490 | 650 | def test_trivial_constructor(self): | 650 | def test_trivial_constructor(self): |
| 1493 | 651 | transport = get_transport('trace+' + self.get_url('')) | 651 | t = transport.get_transport('trace+' + self.get_url('')) |
| 1494 | 652 | index = btree_index.BTreeGraphIndex(transport, 'index', None) | 652 | index = btree_index.BTreeGraphIndex(t, 'index', None) |
| 1495 | 653 | # Checks the page size at load, but that isn't logged yet. | 653 | # Checks the page size at load, but that isn't logged yet. |
| 1497 | 654 | self.assertEqual([], transport._activity) | 654 | self.assertEqual([], t._activity) |
| 1498 | 655 | 655 | ||
| 1499 | 656 | def test_with_size_constructor(self): | 656 | def test_with_size_constructor(self): |
| 1502 | 657 | transport = get_transport('trace+' + self.get_url('')) | 657 | t = transport.get_transport('trace+' + self.get_url('')) |
| 1503 | 658 | index = btree_index.BTreeGraphIndex(transport, 'index', 1) | 658 | index = btree_index.BTreeGraphIndex(t, 'index', 1) |
| 1504 | 659 | # Checks the page size at load, but that isn't logged yet. | 659 | # Checks the page size at load, but that isn't logged yet. |
| 1506 | 660 | self.assertEqual([], transport._activity) | 660 | self.assertEqual([], t._activity) |
| 1507 | 661 | 661 | ||
| 1508 | 662 | def test_empty_key_count_no_size(self): | 662 | def test_empty_key_count_no_size(self): |
| 1509 | 663 | builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0) | 663 | builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0) |
| 1515 | 664 | transport = get_transport('trace+' + self.get_url('')) | 664 | t = transport.get_transport('trace+' + self.get_url('')) |
| 1516 | 665 | transport.put_file('index', builder.finish()) | 665 | t.put_file('index', builder.finish()) |
| 1517 | 666 | index = btree_index.BTreeGraphIndex(transport, 'index', None) | 666 | index = btree_index.BTreeGraphIndex(t, 'index', None) |
| 1518 | 667 | del transport._activity[:] | 667 | del t._activity[:] |
| 1519 | 668 | self.assertEqual([], transport._activity) | 668 | self.assertEqual([], t._activity) |
| 1520 | 669 | self.assertEqual(0, index.key_count()) | 669 | self.assertEqual(0, index.key_count()) |
| 1521 | 670 | # The entire index should have been requested (as we generally have the | 670 | # The entire index should have been requested (as we generally have the |
| 1522 | 671 | # size available, and doing many small readvs is inappropriate). | 671 | # size available, and doing many small readvs is inappropriate). |
| 1523 | 672 | # We can't tell how much was actually read here, but - check the code. | 672 | # We can't tell how much was actually read here, but - check the code. |
| 1525 | 673 | self.assertEqual([('get', 'index')], transport._activity) | 673 | self.assertEqual([('get', 'index')], t._activity) |
| 1526 | 674 | 674 | ||
| 1527 | 675 | def test_empty_key_count(self): | 675 | def test_empty_key_count(self): |
| 1528 | 676 | builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0) | 676 | builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0) |
| 1531 | 677 | transport = get_transport('trace+' + self.get_url('')) | 677 | t = transport.get_transport('trace+' + self.get_url('')) |
| 1532 | 678 | size = transport.put_file('index', builder.finish()) | 678 | size = t.put_file('index', builder.finish()) |
| 1533 | 679 | self.assertEqual(72, size) | 679 | self.assertEqual(72, size) |
| 1537 | 680 | index = btree_index.BTreeGraphIndex(transport, 'index', size) | 680 | index = btree_index.BTreeGraphIndex(t, 'index', size) |
| 1538 | 681 | del transport._activity[:] | 681 | del t._activity[:] |
| 1539 | 682 | self.assertEqual([], transport._activity) | 682 | self.assertEqual([], t._activity) |
| 1540 | 683 | self.assertEqual(0, index.key_count()) | 683 | self.assertEqual(0, index.key_count()) |
| 1541 | 684 | # The entire index should have been read, as 4K > size | 684 | # The entire index should have been read, as 4K > size |
| 1542 | 685 | self.assertEqual([('readv', 'index', [(0, 72)], False, None)], | 685 | self.assertEqual([('readv', 'index', [(0, 72)], False, None)], |
| 1544 | 686 | transport._activity) | 686 | t._activity) |
| 1545 | 687 | 687 | ||
| 1546 | 688 | def test_non_empty_key_count_2_2(self): | 688 | def test_non_empty_key_count_2_2(self): |
| 1547 | 689 | builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2) | 689 | builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2) |
| 1548 | 690 | nodes = self.make_nodes(35, 2, 2) | 690 | nodes = self.make_nodes(35, 2, 2) |
| 1549 | 691 | for node in nodes: | 691 | for node in nodes: |
| 1550 | 692 | builder.add_node(*node) | 692 | builder.add_node(*node) |
| 1556 | 693 | transport = get_transport('trace+' + self.get_url('')) | 693 | t = transport.get_transport('trace+' + self.get_url('')) |
| 1557 | 694 | size = transport.put_file('index', builder.finish()) | 694 | size = t.put_file('index', builder.finish()) |
| 1558 | 695 | index = btree_index.BTreeGraphIndex(transport, 'index', size) | 695 | index = btree_index.BTreeGraphIndex(t, 'index', size) |
| 1559 | 696 | del transport._activity[:] | 696 | del t._activity[:] |
| 1560 | 697 | self.assertEqual([], transport._activity) | 697 | self.assertEqual([], t._activity) |
| 1561 | 698 | self.assertEqual(70, index.key_count()) | 698 | self.assertEqual(70, index.key_count()) |
| 1562 | 699 | # The entire index should have been read, as it is one page long. | 699 | # The entire index should have been read, as it is one page long. |
| 1563 | 700 | self.assertEqual([('readv', 'index', [(0, size)], False, None)], | 700 | self.assertEqual([('readv', 'index', [(0, size)], False, None)], |
| 1565 | 701 | transport._activity) | 701 | t._activity) |
| 1566 | 702 | self.assertEqual(1173, size) | 702 | self.assertEqual(1173, size) |
| 1567 | 703 | 703 | ||
| 1568 | 704 | def test_with_offset_no_size(self): | 704 | def test_with_offset_no_size(self): |
| 1569 | @@ -722,7 +722,7 @@ | |||
| 1570 | 722 | 722 | ||
| 1571 | 723 | def test__read_nodes_no_size_one_page_reads_once(self): | 723 | def test__read_nodes_no_size_one_page_reads_once(self): |
| 1572 | 724 | self.make_index(nodes=[(('key',), 'value', ())]) | 724 | self.make_index(nodes=[(('key',), 'value', ())]) |
| 1574 | 725 | trans = get_transport('trace+' + self.get_url()) | 725 | trans = transport.get_transport('trace+' + self.get_url()) |
| 1575 | 726 | index = btree_index.BTreeGraphIndex(trans, 'index', None) | 726 | index = btree_index.BTreeGraphIndex(trans, 'index', None) |
| 1576 | 727 | del trans._activity[:] | 727 | del trans._activity[:] |
| 1577 | 728 | nodes = dict(index._read_nodes([0])) | 728 | nodes = dict(index._read_nodes([0])) |
| 1578 | @@ -736,7 +736,7 @@ | |||
| 1579 | 736 | index.key_count() | 736 | index.key_count() |
| 1580 | 737 | num_pages = index._row_offsets[-1] | 737 | num_pages = index._row_offsets[-1] |
| 1581 | 738 | # Reopen with a traced transport and no size | 738 | # Reopen with a traced transport and no size |
| 1583 | 739 | trans = get_transport('trace+' + self.get_url()) | 739 | trans = transport.get_transport('trace+' + self.get_url()) |
| 1584 | 740 | index = btree_index.BTreeGraphIndex(trans, 'index', None) | 740 | index = btree_index.BTreeGraphIndex(trans, 'index', None) |
| 1585 | 741 | del trans._activity[:] | 741 | del trans._activity[:] |
| 1586 | 742 | nodes = dict(index._read_nodes([0])) | 742 | nodes = dict(index._read_nodes([0])) |
| 1587 | @@ -747,31 +747,31 @@ | |||
| 1588 | 747 | nodes = self.make_nodes(160, 2, 2) | 747 | nodes = self.make_nodes(160, 2, 2) |
| 1589 | 748 | for node in nodes: | 748 | for node in nodes: |
| 1590 | 749 | builder.add_node(*node) | 749 | builder.add_node(*node) |
| 1593 | 750 | transport = get_transport('trace+' + self.get_url('')) | 750 | t = transport.get_transport('trace+' + self.get_url('')) |
| 1594 | 751 | size = transport.put_file('index', builder.finish()) | 751 | size = t.put_file('index', builder.finish()) |
| 1595 | 752 | self.assertEqual(17692, size) | 752 | self.assertEqual(17692, size) |
| 1599 | 753 | index = btree_index.BTreeGraphIndex(transport, 'index', size) | 753 | index = btree_index.BTreeGraphIndex(t, 'index', size) |
| 1600 | 754 | del transport._activity[:] | 754 | del t._activity[:] |
| 1601 | 755 | self.assertEqual([], transport._activity) | 755 | self.assertEqual([], t._activity) |
| 1602 | 756 | self.assertEqual(320, index.key_count()) | 756 | self.assertEqual(320, index.key_count()) |
| 1603 | 757 | # The entire index should not have been read. | 757 | # The entire index should not have been read. |
| 1604 | 758 | self.assertEqual([('readv', 'index', [(0, 4096)], False, None)], | 758 | self.assertEqual([('readv', 'index', [(0, 4096)], False, None)], |
| 1606 | 759 | transport._activity) | 759 | t._activity) |
| 1607 | 760 | 760 | ||
| 1608 | 761 | def test_validate_one_page(self): | 761 | def test_validate_one_page(self): |
| 1609 | 762 | builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2) | 762 | builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2) |
| 1610 | 763 | nodes = self.make_nodes(45, 2, 2) | 763 | nodes = self.make_nodes(45, 2, 2) |
| 1611 | 764 | for node in nodes: | 764 | for node in nodes: |
| 1612 | 765 | builder.add_node(*node) | 765 | builder.add_node(*node) |
| 1618 | 766 | transport = get_transport('trace+' + self.get_url('')) | 766 | t = transport.get_transport('trace+' + self.get_url('')) |
| 1619 | 767 | size = transport.put_file('index', builder.finish()) | 767 | size = t.put_file('index', builder.finish()) |
| 1620 | 768 | index = btree_index.BTreeGraphIndex(transport, 'index', size) | 768 | index = btree_index.BTreeGraphIndex(t, 'index', size) |
| 1621 | 769 | del transport._activity[:] | 769 | del t._activity[:] |
| 1622 | 770 | self.assertEqual([], transport._activity) | 770 | self.assertEqual([], t._activity) |
| 1623 | 771 | index.validate() | 771 | index.validate() |
| 1624 | 772 | # The entire index should have been read linearly. | 772 | # The entire index should have been read linearly. |
| 1625 | 773 | self.assertEqual([('readv', 'index', [(0, size)], False, None)], | 773 | self.assertEqual([('readv', 'index', [(0, size)], False, None)], |
| 1627 | 774 | transport._activity) | 774 | t._activity) |
| 1628 | 775 | self.assertEqual(1488, size) | 775 | self.assertEqual(1488, size) |
| 1629 | 776 | 776 | ||
| 1630 | 777 | def test_validate_two_pages(self): | 777 | def test_validate_two_pages(self): |
| 1631 | @@ -779,64 +779,65 @@ | |||
| 1632 | 779 | nodes = self.make_nodes(80, 2, 2) | 779 | nodes = self.make_nodes(80, 2, 2) |
| 1633 | 780 | for node in nodes: | 780 | for node in nodes: |
| 1634 | 781 | builder.add_node(*node) | 781 | builder.add_node(*node) |
| 1637 | 782 | transport = get_transport('trace+' + self.get_url('')) | 782 | t = transport.get_transport('trace+' + self.get_url('')) |
| 1638 | 783 | size = transport.put_file('index', builder.finish()) | 783 | size = t.put_file('index', builder.finish()) |
| 1639 | 784 | # Root page, 2 leaf pages | 784 | # Root page, 2 leaf pages |
| 1640 | 785 | self.assertEqual(9339, size) | 785 | self.assertEqual(9339, size) |
| 1644 | 786 | index = btree_index.BTreeGraphIndex(transport, 'index', size) | 786 | index = btree_index.BTreeGraphIndex(t, 'index', size) |
| 1645 | 787 | del transport._activity[:] | 787 | del t._activity[:] |
| 1646 | 788 | self.assertEqual([], transport._activity) | 788 | self.assertEqual([], t._activity) |
| 1647 | 789 | index.validate() | 789 | index.validate() |
| 1648 | 790 | # The entire index should have been read linearly. | 790 | # The entire index should have been read linearly. |
| 1652 | 791 | self.assertEqual([('readv', 'index', [(0, 4096)], False, None), | 791 | self.assertEqual( |
| 1653 | 792 | ('readv', 'index', [(4096, 4096), (8192, 1147)], False, None)], | 792 | [('readv', 'index', [(0, 4096)], False, None), |
| 1654 | 793 | transport._activity) | 793 | ('readv', 'index', [(4096, 4096), (8192, 1147)], False, None)], |
| 1655 | 794 | t._activity) | ||
| 1656 | 794 | # XXX: TODO: write some badly-ordered nodes, and some pointers-to-wrong | 795 | # XXX: TODO: write some badly-ordered nodes, and some pointers-to-wrong |
| 1657 | 795 | # node and make validate find them. | 796 | # node and make validate find them. |
| 1658 | 796 | 797 | ||
| 1659 | 797 | def test_eq_ne(self): | 798 | def test_eq_ne(self): |
| 1660 | 798 | # two indices are equal when constructed with the same parameters: | 799 | # two indices are equal when constructed with the same parameters: |
| 1693 | 799 | transport1 = get_transport('trace+' + self.get_url('')) | 800 | t1 = transport.get_transport('trace+' + self.get_url('')) |
| 1694 | 800 | transport2 = get_transport(self.get_url('')) | 801 | t2 = transport.get_transport(self.get_url('')) |
| 1695 | 801 | self.assertTrue( | 802 | self.assertTrue( |
| 1696 | 802 | btree_index.BTreeGraphIndex(transport1, 'index', None) == | 803 | btree_index.BTreeGraphIndex(t1, 'index', None) == |
| 1697 | 803 | btree_index.BTreeGraphIndex(transport1, 'index', None)) | 804 | btree_index.BTreeGraphIndex(t1, 'index', None)) |
| 1698 | 804 | self.assertTrue( | 805 | self.assertTrue( |
| 1699 | 805 | btree_index.BTreeGraphIndex(transport1, 'index', 20) == | 806 | btree_index.BTreeGraphIndex(t1, 'index', 20) == |
| 1700 | 806 | btree_index.BTreeGraphIndex(transport1, 'index', 20)) | 807 | btree_index.BTreeGraphIndex(t1, 'index', 20)) |
| 1701 | 807 | self.assertFalse( | 808 | self.assertFalse( |
| 1702 | 808 | btree_index.BTreeGraphIndex(transport1, 'index', 20) == | 809 | btree_index.BTreeGraphIndex(t1, 'index', 20) == |
| 1703 | 809 | btree_index.BTreeGraphIndex(transport2, 'index', 20)) | 810 | btree_index.BTreeGraphIndex(t2, 'index', 20)) |
| 1704 | 810 | self.assertFalse( | 811 | self.assertFalse( |
| 1705 | 811 | btree_index.BTreeGraphIndex(transport1, 'inde1', 20) == | 812 | btree_index.BTreeGraphIndex(t1, 'inde1', 20) == |
| 1706 | 812 | btree_index.BTreeGraphIndex(transport1, 'inde2', 20)) | 813 | btree_index.BTreeGraphIndex(t1, 'inde2', 20)) |
| 1707 | 813 | self.assertFalse( | 814 | self.assertFalse( |
| 1708 | 814 | btree_index.BTreeGraphIndex(transport1, 'index', 10) == | 815 | btree_index.BTreeGraphIndex(t1, 'index', 10) == |
| 1709 | 815 | btree_index.BTreeGraphIndex(transport1, 'index', 20)) | 816 | btree_index.BTreeGraphIndex(t1, 'index', 20)) |
| 1710 | 816 | self.assertFalse( | 817 | self.assertFalse( |
| 1711 | 817 | btree_index.BTreeGraphIndex(transport1, 'index', None) != | 818 | btree_index.BTreeGraphIndex(t1, 'index', None) != |
| 1712 | 818 | btree_index.BTreeGraphIndex(transport1, 'index', None)) | 819 | btree_index.BTreeGraphIndex(t1, 'index', None)) |
| 1713 | 819 | self.assertFalse( | 820 | self.assertFalse( |
| 1714 | 820 | btree_index.BTreeGraphIndex(transport1, 'index', 20) != | 821 | btree_index.BTreeGraphIndex(t1, 'index', 20) != |
| 1715 | 821 | btree_index.BTreeGraphIndex(transport1, 'index', 20)) | 822 | btree_index.BTreeGraphIndex(t1, 'index', 20)) |
| 1716 | 822 | self.assertTrue( | 823 | self.assertTrue( |
| 1717 | 823 | btree_index.BTreeGraphIndex(transport1, 'index', 20) != | 824 | btree_index.BTreeGraphIndex(t1, 'index', 20) != |
| 1718 | 824 | btree_index.BTreeGraphIndex(transport2, 'index', 20)) | 825 | btree_index.BTreeGraphIndex(t2, 'index', 20)) |
| 1719 | 825 | self.assertTrue( | 826 | self.assertTrue( |
| 1720 | 826 | btree_index.BTreeGraphIndex(transport1, 'inde1', 20) != | 827 | btree_index.BTreeGraphIndex(t1, 'inde1', 20) != |
| 1721 | 827 | btree_index.BTreeGraphIndex(transport1, 'inde2', 20)) | 828 | btree_index.BTreeGraphIndex(t1, 'inde2', 20)) |
| 1722 | 828 | self.assertTrue( | 829 | self.assertTrue( |
| 1723 | 829 | btree_index.BTreeGraphIndex(transport1, 'index', 10) != | 830 | btree_index.BTreeGraphIndex(t1, 'index', 10) != |
| 1724 | 830 | btree_index.BTreeGraphIndex(transport1, 'index', 20)) | 831 | btree_index.BTreeGraphIndex(t1, 'index', 20)) |
| 1725 | 831 | 832 | ||
| 1726 | 832 | def test_iter_all_only_root_no_size(self): | 833 | def test_iter_all_only_root_no_size(self): |
| 1727 | 833 | self.make_index(nodes=[(('key',), 'value', ())]) | 834 | self.make_index(nodes=[(('key',), 'value', ())]) |
| 1731 | 834 | trans = get_transport('trace+' + self.get_url('')) | 835 | t = transport.get_transport('trace+' + self.get_url('')) |
| 1732 | 835 | index = btree_index.BTreeGraphIndex(trans, 'index', None) | 836 | index = btree_index.BTreeGraphIndex(t, 'index', None) |
| 1733 | 836 | del trans._activity[:] | 837 | del t._activity[:] |
| 1734 | 837 | self.assertEqual([(('key',), 'value')], | 838 | self.assertEqual([(('key',), 'value')], |
| 1735 | 838 | [x[1:] for x in index.iter_all_entries()]) | 839 | [x[1:] for x in index.iter_all_entries()]) |
| 1737 | 839 | self.assertEqual([('get', 'index')], trans._activity) | 840 | self.assertEqual([('get', 'index')], t._activity) |
| 1738 | 840 | 841 | ||
| 1739 | 841 | def test_iter_all_entries_reads(self): | 842 | def test_iter_all_entries_reads(self): |
| 1740 | 842 | # iterating all entries reads the header, then does a linear | 843 | # iterating all entries reads the header, then does a linear |
| 1741 | @@ -848,15 +849,15 @@ | |||
| 1742 | 848 | nodes = self.make_nodes(10000, 2, 2) | 849 | nodes = self.make_nodes(10000, 2, 2) |
| 1743 | 849 | for node in nodes: | 850 | for node in nodes: |
| 1744 | 850 | builder.add_node(*node) | 851 | builder.add_node(*node) |
| 1747 | 851 | transport = get_transport('trace+' + self.get_url('')) | 852 | t = transport.get_transport('trace+' + self.get_url('')) |
| 1748 | 852 | size = transport.put_file('index', builder.finish()) | 853 | size = t.put_file('index', builder.finish()) |
| 1749 | 853 | self.assertEqual(1303220, size, 'number of expected bytes in the' | 854 | self.assertEqual(1303220, size, 'number of expected bytes in the' |
| 1750 | 854 | ' output changed') | 855 | ' output changed') |
| 1751 | 855 | page_size = btree_index._PAGE_SIZE | 856 | page_size = btree_index._PAGE_SIZE |
| 1752 | 856 | del builder | 857 | del builder |
| 1756 | 857 | index = btree_index.BTreeGraphIndex(transport, 'index', size) | 858 | index = btree_index.BTreeGraphIndex(t, 'index', size) |
| 1757 | 858 | del transport._activity[:] | 859 | del t._activity[:] |
| 1758 | 859 | self.assertEqual([], transport._activity) | 860 | self.assertEqual([], t._activity) |
| 1759 | 860 | found_nodes = self.time(list, index.iter_all_entries()) | 861 | found_nodes = self.time(list, index.iter_all_entries()) |
| 1760 | 861 | bare_nodes = [] | 862 | bare_nodes = [] |
| 1761 | 862 | for node in found_nodes: | 863 | for node in found_nodes: |
| 1762 | @@ -883,7 +884,7 @@ | |||
| 1763 | 883 | readv_request[-1] = (readv_request[-1][0], 1303220 % page_size) | 884 | readv_request[-1] = (readv_request[-1][0], 1303220 % page_size) |
| 1764 | 884 | expected = [('readv', 'index', [(0, page_size)], False, None), | 885 | expected = [('readv', 'index', [(0, page_size)], False, None), |
| 1765 | 885 | ('readv', 'index', readv_request, False, None)] | 886 | ('readv', 'index', readv_request, False, None)] |
| 1767 | 886 | if expected != transport._activity: | 887 | if expected != t._activity: |
| 1768 | 887 | self.assertEqualDiff(pprint.pformat(expected), | 888 | self.assertEqualDiff(pprint.pformat(expected), |
| 1769 | 888 | pprint.pformat(transport._activity)) | 889 | pprint.pformat(transport._activity)) |
| 1770 | 889 | 890 | ||
| 1771 | @@ -903,12 +904,12 @@ | |||
| 1772 | 903 | nodes = self.make_nodes(160, 2, 2) | 904 | nodes = self.make_nodes(160, 2, 2) |
| 1773 | 904 | for node in nodes: | 905 | for node in nodes: |
| 1774 | 905 | builder.add_node(*node) | 906 | builder.add_node(*node) |
| 1777 | 906 | transport = get_transport('trace+' + self.get_url('')) | 907 | t = transport.get_transport('trace+' + self.get_url('')) |
| 1778 | 907 | size = transport.put_file('index', builder.finish()) | 908 | size = t.put_file('index', builder.finish()) |
| 1779 | 908 | del builder | 909 | del builder |
| 1783 | 909 | index = btree_index.BTreeGraphIndex(transport, 'index', size) | 910 | index = btree_index.BTreeGraphIndex(t, 'index', size) |
| 1784 | 910 | del transport._activity[:] | 911 | del t._activity[:] |
| 1785 | 911 | self.assertEqual([], transport._activity) | 912 | self.assertEqual([], t._activity) |
| 1786 | 912 | # search for one key | 913 | # search for one key |
| 1787 | 913 | found_nodes = list(index.iter_entries([nodes[30][0]])) | 914 | found_nodes = list(index.iter_entries([nodes[30][0]])) |
| 1788 | 914 | bare_nodes = [] | 915 | bare_nodes = [] |
| 1789 | @@ -922,7 +923,7 @@ | |||
| 1790 | 922 | # Should have read the root node, then one leaf page: | 923 | # Should have read the root node, then one leaf page: |
| 1791 | 923 | self.assertEqual([('readv', 'index', [(0, 4096)], False, None), | 924 | self.assertEqual([('readv', 'index', [(0, 4096)], False, None), |
| 1792 | 924 | ('readv', 'index', [(8192, 4096), ], False, None)], | 925 | ('readv', 'index', [(8192, 4096), ], False, None)], |
| 1794 | 925 | transport._activity) | 926 | t._activity) |
| 1795 | 926 | 927 | ||
| 1796 | 927 | def test_iter_key_prefix_1_element_key_None(self): | 928 | def test_iter_key_prefix_1_element_key_None(self): |
| 1797 | 928 | index = self.make_index() | 929 | index = self.make_index() |
| 1798 | @@ -1152,7 +1153,7 @@ | |||
| 1799 | 1152 | for node in nodes: | 1153 | for node in nodes: |
| 1800 | 1153 | builder.add_node(*node) | 1154 | builder.add_node(*node) |
| 1801 | 1154 | stream = builder.finish() | 1155 | stream = builder.finish() |
| 1803 | 1155 | trans = get_transport(self.get_url()) | 1156 | trans = transport.get_transport(self.get_url()) |
| 1804 | 1156 | size = trans.put_file('index', stream) | 1157 | size = trans.put_file('index', stream) |
| 1805 | 1157 | index = btree_index.BTreeGraphIndex(trans, 'index', size) | 1158 | index = btree_index.BTreeGraphIndex(trans, 'index', size) |
| 1806 | 1158 | self.assertEqual(500, index.key_count()) | 1159 | self.assertEqual(500, index.key_count()) |
| 1807 | @@ -1349,8 +1350,8 @@ | |||
| 1808 | 1349 | This doesn't actually create anything on disk, it just primes a | 1350 | This doesn't actually create anything on disk, it just primes a |
| 1809 | 1350 | BTreeGraphIndex with the recommended information. | 1351 | BTreeGraphIndex with the recommended information. |
| 1810 | 1351 | """ | 1352 | """ |
| 1813 | 1352 | index = btree_index.BTreeGraphIndex(get_transport('memory:///'), | 1353 | index = btree_index.BTreeGraphIndex( |
| 1814 | 1353 | 'test-index', size=size) | 1354 | transport.get_transport('memory:///'), 'test-index', size=size) |
| 1815 | 1354 | if recommended_pages is not None: | 1355 | if recommended_pages is not None: |
| 1816 | 1355 | index._recommended_pages = recommended_pages | 1356 | index._recommended_pages = recommended_pages |
| 1817 | 1356 | return index | 1357 | return index |
| 1818 | 1357 | 1358 | ||
| 1819 | === modified file 'bzrlib/tests/test_bzrdir.py' | |||
| 1820 | --- bzrlib/tests/test_bzrdir.py 2010-06-25 04:49:54 +0000 | |||
| 1821 | +++ bzrlib/tests/test_bzrdir.py 2010-06-29 17:48:31 +0000 | |||
| 1822 | @@ -1159,9 +1159,11 @@ | |||
| 1823 | 1159 | """ | 1159 | """ |
| 1824 | 1160 | 1160 | ||
| 1825 | 1161 | def create_transport_readonly_server(self): | 1161 | def create_transport_readonly_server(self): |
| 1826 | 1162 | # We don't set the http protocol version, relying on the default | ||
| 1827 | 1162 | return http_utils.HTTPServerRedirecting() | 1163 | return http_utils.HTTPServerRedirecting() |
| 1828 | 1163 | 1164 | ||
| 1829 | 1164 | def create_transport_secondary_server(self): | 1165 | def create_transport_secondary_server(self): |
| 1830 | 1166 | # We don't set the http protocol version, relying on the default | ||
| 1831 | 1165 | return http_utils.HTTPServerRedirecting() | 1167 | return http_utils.HTTPServerRedirecting() |
| 1832 | 1166 | 1168 | ||
| 1833 | 1167 | def setUp(self): | 1169 | def setUp(self): |
| 1834 | 1168 | 1170 | ||
| 1835 | === modified file 'bzrlib/tests/test_debug.py' | |||
| 1836 | --- bzrlib/tests/test_debug.py 2009-03-23 14:59:43 +0000 | |||
| 1837 | +++ bzrlib/tests/test_debug.py 2010-06-29 17:48:31 +0000 | |||
| 1838 | @@ -1,4 +1,4 @@ | |||
| 1840 | 1 | # Copyright (C) 2009 Canonical Ltd | 1 | # Copyright (C) 2009, 2010 Canonical Ltd |
| 1841 | 2 | # | 2 | # |
| 1842 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 1843 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 1844 | @@ -20,13 +20,14 @@ | |||
| 1845 | 20 | import os | 20 | import os |
| 1846 | 21 | 21 | ||
| 1847 | 22 | 22 | ||
| 1849 | 23 | from bzrlib import debug | 23 | from bzrlib import ( |
| 1850 | 24 | debug, | ||
| 1851 | 25 | tests, | ||
| 1852 | 26 | ) | ||
| 1853 | 24 | from bzrlib.config import config_filename, ensure_config_dir_exists | 27 | from bzrlib.config import config_filename, ensure_config_dir_exists |
| 1859 | 25 | from bzrlib.transport import get_transport | 28 | |
| 1860 | 26 | from bzrlib.tests import TestCaseInTempDir | 29 | |
| 1861 | 27 | 30 | class TestDebugFlags(tests.TestCaseInTempDir): | |
| 1857 | 28 | |||
| 1858 | 29 | class TestDebugFlags(TestCaseInTempDir): | ||
| 1862 | 30 | 31 | ||
| 1863 | 31 | def test_set_debug_flags_from_config(self): | 32 | def test_set_debug_flags_from_config(self): |
| 1864 | 32 | # test both combinations because configobject automatically splits up | 33 | # test both combinations because configobject automatically splits up |
| 1865 | 33 | 34 | ||
| 1866 | === modified file 'bzrlib/tests/test_directory_service.py' | |||
| 1867 | --- bzrlib/tests/test_directory_service.py 2010-06-02 04:50:35 +0000 | |||
| 1868 | +++ bzrlib/tests/test_directory_service.py 2010-06-29 17:48:31 +0000 | |||
| 1869 | @@ -18,11 +18,11 @@ | |||
| 1870 | 18 | 18 | ||
| 1871 | 19 | from bzrlib import ( | 19 | from bzrlib import ( |
| 1872 | 20 | errors, | 20 | errors, |
| 1873 | 21 | transport, | ||
| 1874 | 21 | urlutils, | 22 | urlutils, |
| 1875 | 22 | ) | 23 | ) |
| 1876 | 23 | from bzrlib.directory_service import DirectoryServiceRegistry, directories | 24 | from bzrlib.directory_service import DirectoryServiceRegistry, directories |
| 1877 | 24 | from bzrlib.tests import TestCase, TestCaseWithTransport | 25 | from bzrlib.tests import TestCase, TestCaseWithTransport |
| 1878 | 25 | from bzrlib.transport import get_transport | ||
| 1879 | 26 | 26 | ||
| 1880 | 27 | 27 | ||
| 1881 | 28 | class FooService(object): | 28 | class FooService(object): |
| 1882 | @@ -56,7 +56,7 @@ | |||
| 1883 | 56 | directories.register('foo:', FooService, 'Map foo URLs to http urls') | 56 | directories.register('foo:', FooService, 'Map foo URLs to http urls') |
| 1884 | 57 | self.addCleanup(directories.remove, 'foo:') | 57 | self.addCleanup(directories.remove, 'foo:') |
| 1885 | 58 | self.assertEqual(FooService.base + 'bar/', | 58 | self.assertEqual(FooService.base + 'bar/', |
| 1887 | 59 | get_transport('foo:bar').base) | 59 | transport.get_transport('foo:bar').base) |
| 1888 | 60 | 60 | ||
| 1889 | 61 | 61 | ||
| 1890 | 62 | class TestAliasDirectory(TestCaseWithTransport): | 62 | class TestAliasDirectory(TestCaseWithTransport): |
| 1891 | 63 | 63 | ||
| 1892 | === modified file 'bzrlib/tests/test_http.py' | |||
| 1893 | --- bzrlib/tests/test_http.py 2010-03-18 23:11:15 +0000 | |||
| 1894 | +++ bzrlib/tests/test_http.py 2010-06-29 17:48:31 +0000 | |||
| 1895 | @@ -89,6 +89,18 @@ | |||
| 1896 | 89 | _qualified_prefix='http+pycurl',))) | 89 | _qualified_prefix='http+pycurl',))) |
| 1897 | 90 | tests.multiply_tests(t_tests, transport_scenarios, result) | 90 | tests.multiply_tests(t_tests, transport_scenarios, result) |
| 1898 | 91 | 91 | ||
| 1899 | 92 | protocol_scenarios = [ | ||
| 1900 | 93 | ('HTTP/1.0', dict(_protocol_version='HTTP/1.0')), | ||
| 1901 | 94 | ('HTTP/1.1', dict(_protocol_version='HTTP/1.1')), | ||
| 1902 | 95 | ] | ||
| 1903 | 96 | |||
| 1904 | 97 | # some tests are parametrized by the protocol version only | ||
| 1905 | 98 | p_tests, remaining_tests = tests.split_suite_by_condition( | ||
| 1906 | 99 | remaining_tests, tests.condition_isinstance(( | ||
| 1907 | 100 | TestAuthOnRedirected, | ||
| 1908 | 101 | ))) | ||
| 1909 | 102 | tests.multiply_tests(p_tests, protocol_scenarios, result) | ||
| 1910 | 103 | |||
| 1911 | 92 | # each implementation tested with each HTTP version | 104 | # each implementation tested with each HTTP version |
| 1912 | 93 | tp_tests, remaining_tests = tests.split_suite_by_condition( | 105 | tp_tests, remaining_tests = tests.split_suite_by_condition( |
| 1913 | 94 | remaining_tests, tests.condition_isinstance(( | 106 | remaining_tests, tests.condition_isinstance(( |
| 1914 | @@ -103,10 +115,6 @@ | |||
| 1915 | 103 | TestRanges, | 115 | TestRanges, |
| 1916 | 104 | TestSpecificRequestHandler, | 116 | TestSpecificRequestHandler, |
| 1917 | 105 | ))) | 117 | ))) |
| 1918 | 106 | protocol_scenarios = [ | ||
| 1919 | 107 | ('HTTP/1.0', dict(_protocol_version='HTTP/1.0')), | ||
| 1920 | 108 | ('HTTP/1.1', dict(_protocol_version='HTTP/1.1')), | ||
| 1921 | 109 | ] | ||
| 1922 | 110 | tp_scenarios = tests.multiply_scenarios(transport_scenarios, | 118 | tp_scenarios = tests.multiply_scenarios(transport_scenarios, |
| 1923 | 111 | protocol_scenarios) | 119 | protocol_scenarios) |
| 1924 | 112 | tests.multiply_tests(tp_tests, tp_scenarios, result) | 120 | tests.multiply_tests(tp_tests, tp_scenarios, result) |
| 1925 | @@ -2156,13 +2164,14 @@ | |||
| 1926 | 2156 | _transport = _urllib.HttpTransport_urllib | 2164 | _transport = _urllib.HttpTransport_urllib |
| 1927 | 2157 | 2165 | ||
| 1928 | 2158 | def create_transport_readonly_server(self): | 2166 | def create_transport_readonly_server(self): |
| 1930 | 2159 | return self._auth_server() | 2167 | return self._auth_server(protocol_version=self._protocol_version) |
| 1931 | 2160 | 2168 | ||
| 1932 | 2161 | def create_transport_secondary_server(self): | 2169 | def create_transport_secondary_server(self): |
| 1933 | 2162 | """Create the secondary server redirecting to the primary server""" | 2170 | """Create the secondary server redirecting to the primary server""" |
| 1934 | 2163 | new = self.get_readonly_server() | 2171 | new = self.get_readonly_server() |
| 1935 | 2164 | 2172 | ||
| 1937 | 2165 | redirecting = http_utils.HTTPServerRedirecting() | 2173 | redirecting = http_utils.HTTPServerRedirecting( |
| 1938 | 2174 | protocol_version=self._protocol_version) | ||
| 1939 | 2166 | redirecting.redirect_to(new.host, new.port) | 2175 | redirecting.redirect_to(new.host, new.port) |
| 1940 | 2167 | return redirecting | 2176 | return redirecting |
| 1941 | 2168 | 2177 | ||
| 1942 | 2169 | 2178 | ||
| 1943 | === modified file 'bzrlib/tests/test_index.py' | |||
| 1944 | --- bzrlib/tests/test_index.py 2010-04-08 07:01:10 +0000 | |||
| 1945 | +++ bzrlib/tests/test_index.py 2010-06-29 17:48:31 +0000 | |||
| 1946 | @@ -16,16 +16,18 @@ | |||
| 1947 | 16 | 16 | ||
| 1948 | 17 | """Tests for indices.""" | 17 | """Tests for indices.""" |
| 1949 | 18 | 18 | ||
| 1957 | 19 | from bzrlib import errors | 19 | from bzrlib import ( |
| 1958 | 20 | from bzrlib.index import * | 20 | errors, |
| 1959 | 21 | from bzrlib.tests import TestCaseWithMemoryTransport | 21 | index, |
| 1960 | 22 | from bzrlib.transport import get_transport | 22 | tests, |
| 1961 | 23 | 23 | transport, | |
| 1962 | 24 | 24 | ) | |
| 1963 | 25 | class TestGraphIndexBuilder(TestCaseWithMemoryTransport): | 25 | |
| 1964 | 26 | |||
| 1965 | 27 | class TestGraphIndexBuilder(tests.TestCaseWithMemoryTransport): | ||
| 1966 | 26 | 28 | ||
| 1967 | 27 | def test_build_index_empty(self): | 29 | def test_build_index_empty(self): |
| 1969 | 28 | builder = GraphIndexBuilder() | 30 | builder = index.GraphIndexBuilder() |
| 1970 | 29 | stream = builder.finish() | 31 | stream = builder.finish() |
| 1971 | 30 | contents = stream.read() | 32 | contents = stream.read() |
| 1972 | 31 | self.assertEqual( | 33 | self.assertEqual( |
| 1973 | @@ -33,7 +35,7 @@ | |||
| 1974 | 33 | contents) | 35 | contents) |
| 1975 | 34 | 36 | ||
| 1976 | 35 | def test_build_index_empty_two_element_keys(self): | 37 | def test_build_index_empty_two_element_keys(self): |
| 1978 | 36 | builder = GraphIndexBuilder(key_elements=2) | 38 | builder = index.GraphIndexBuilder(key_elements=2) |
| 1979 | 37 | stream = builder.finish() | 39 | stream = builder.finish() |
| 1980 | 38 | contents = stream.read() | 40 | contents = stream.read() |
| 1981 | 39 | self.assertEqual( | 41 | self.assertEqual( |
| 1982 | @@ -41,7 +43,7 @@ | |||
| 1983 | 41 | contents) | 43 | contents) |
| 1984 | 42 | 44 | ||
| 1985 | 43 | def test_build_index_one_reference_list_empty(self): | 45 | def test_build_index_one_reference_list_empty(self): |
| 1987 | 44 | builder = GraphIndexBuilder(reference_lists=1) | 46 | builder = index.GraphIndexBuilder(reference_lists=1) |
| 1988 | 45 | stream = builder.finish() | 47 | stream = builder.finish() |
| 1989 | 46 | contents = stream.read() | 48 | contents = stream.read() |
| 1990 | 47 | self.assertEqual( | 49 | self.assertEqual( |
| 1991 | @@ -49,7 +51,7 @@ | |||
| 1992 | 49 | contents) | 51 | contents) |
| 1993 | 50 | 52 | ||
| 1994 | 51 | def test_build_index_two_reference_list_empty(self): | 53 | def test_build_index_two_reference_list_empty(self): |
| 1996 | 52 | builder = GraphIndexBuilder(reference_lists=2) | 54 | builder = index.GraphIndexBuilder(reference_lists=2) |
| 1997 | 53 | stream = builder.finish() | 55 | stream = builder.finish() |
| 1998 | 54 | contents = stream.read() | 56 | contents = stream.read() |
| 1999 | 55 | self.assertEqual( | 57 | self.assertEqual( |
| 2000 | @@ -57,7 +59,7 @@ | |||
| 2001 | 57 | contents) | 59 | contents) |
| 2002 | 58 | 60 | ||
| 2003 | 59 | def test_build_index_one_node_no_refs(self): | 61 | def test_build_index_one_node_no_refs(self): |
| 2005 | 60 | builder = GraphIndexBuilder() | 62 | builder = index.GraphIndexBuilder() |
| 2006 | 61 | builder.add_node(('akey', ), 'data') | 63 | builder.add_node(('akey', ), 'data') |
| 2007 | 62 | stream = builder.finish() | 64 | stream = builder.finish() |
| 2008 | 63 | contents = stream.read() | 65 | contents = stream.read() |
| 2009 | @@ -66,7 +68,7 @@ | |||
| 2010 | 66 | "akey\x00\x00\x00data\n\n", contents) | 68 | "akey\x00\x00\x00data\n\n", contents) |
| 2011 | 67 | 69 | ||
| 2012 | 68 | def test_build_index_one_node_no_refs_accepts_empty_reflist(self): | 70 | def test_build_index_one_node_no_refs_accepts_empty_reflist(self): |
| 2014 | 69 | builder = GraphIndexBuilder() | 71 | builder = index.GraphIndexBuilder() |
| 2015 | 70 | builder.add_node(('akey', ), 'data', ()) | 72 | builder.add_node(('akey', ), 'data', ()) |
| 2016 | 71 | stream = builder.finish() | 73 | stream = builder.finish() |
| 2017 | 72 | contents = stream.read() | 74 | contents = stream.read() |
| 2018 | @@ -78,7 +80,7 @@ | |||
| 2019 | 78 | # multipart keys are separated by \x00 - because they are fixed length, | 80 | # multipart keys are separated by \x00 - because they are fixed length, |
| 2020 | 79 | # not variable this does not cause any issues, and seems clearer to the | 81 | # not variable this does not cause any issues, and seems clearer to the |
| 2021 | 80 | # author. | 82 | # author. |
| 2023 | 81 | builder = GraphIndexBuilder(key_elements=2) | 83 | builder = index.GraphIndexBuilder(key_elements=2) |
| 2024 | 82 | builder.add_node(('akey', 'secondpart'), 'data') | 84 | builder.add_node(('akey', 'secondpart'), 'data') |
| 2025 | 83 | stream = builder.finish() | 85 | stream = builder.finish() |
| 2026 | 84 | contents = stream.read() | 86 | contents = stream.read() |
| 2027 | @@ -87,7 +89,7 @@ | |||
| 2028 | 87 | "akey\x00secondpart\x00\x00\x00data\n\n", contents) | 89 | "akey\x00secondpart\x00\x00\x00data\n\n", contents) |
| 2029 | 88 | 90 | ||
| 2030 | 89 | def test_add_node_empty_value(self): | 91 | def test_add_node_empty_value(self): |
| 2032 | 90 | builder = GraphIndexBuilder() | 92 | builder = index.GraphIndexBuilder() |
| 2033 | 91 | builder.add_node(('akey', ), '') | 93 | builder.add_node(('akey', ), '') |
| 2034 | 92 | stream = builder.finish() | 94 | stream = builder.finish() |
| 2035 | 93 | contents = stream.read() | 95 | contents = stream.read() |
| 2036 | @@ -97,7 +99,7 @@ | |||
| 2037 | 97 | 99 | ||
| 2038 | 98 | def test_build_index_nodes_sorted(self): | 100 | def test_build_index_nodes_sorted(self): |
| 2039 | 99 | # the highest sorted node comes first. | 101 | # the highest sorted node comes first. |
| 2041 | 100 | builder = GraphIndexBuilder() | 102 | builder = index.GraphIndexBuilder() |
| 2042 | 101 | # use three to have a good chance of glitching dictionary hash | 103 | # use three to have a good chance of glitching dictionary hash |
| 2043 | 102 | # lookups etc. Insert in randomish order that is not correct | 104 | # lookups etc. Insert in randomish order that is not correct |
| 2044 | 103 | # and not the reverse of the correct order. | 105 | # and not the reverse of the correct order. |
| 2045 | @@ -115,7 +117,7 @@ | |||
| 2046 | 115 | 117 | ||
| 2047 | 116 | def test_build_index_2_element_key_nodes_sorted(self): | 118 | def test_build_index_2_element_key_nodes_sorted(self): |
| 2048 | 117 | # multiple element keys are sorted first-key, second-key. | 119 | # multiple element keys are sorted first-key, second-key. |
| 2050 | 118 | builder = GraphIndexBuilder(key_elements=2) | 120 | builder = index.GraphIndexBuilder(key_elements=2) |
| 2051 | 119 | # use three values of each key element, to have a good chance of | 121 | # use three values of each key element, to have a good chance of |
| 2052 | 120 | # glitching dictionary hash lookups etc. Insert in randomish order that | 122 | # glitching dictionary hash lookups etc. Insert in randomish order that |
| 2053 | 121 | # is not correct and not the reverse of the correct order. | 123 | # is not correct and not the reverse of the correct order. |
| 2054 | @@ -144,7 +146,7 @@ | |||
| 2055 | 144 | "\n", contents) | 146 | "\n", contents) |
| 2056 | 145 | 147 | ||
| 2057 | 146 | def test_build_index_reference_lists_are_included_one(self): | 148 | def test_build_index_reference_lists_are_included_one(self): |
| 2059 | 147 | builder = GraphIndexBuilder(reference_lists=1) | 149 | builder = index.GraphIndexBuilder(reference_lists=1) |
| 2060 | 148 | builder.add_node(('key', ), 'data', ([], )) | 150 | builder.add_node(('key', ), 'data', ([], )) |
| 2061 | 149 | stream = builder.finish() | 151 | stream = builder.finish() |
| 2062 | 150 | contents = stream.read() | 152 | contents = stream.read() |
| 2063 | @@ -154,7 +156,7 @@ | |||
| 2064 | 154 | "\n", contents) | 156 | "\n", contents) |
| 2065 | 155 | 157 | ||
| 2066 | 156 | def test_build_index_reference_lists_with_2_element_keys(self): | 158 | def test_build_index_reference_lists_with_2_element_keys(self): |
| 2068 | 157 | builder = GraphIndexBuilder(reference_lists=1, key_elements=2) | 159 | builder = index.GraphIndexBuilder(reference_lists=1, key_elements=2) |
| 2069 | 158 | builder.add_node(('key', 'key2'), 'data', ([], )) | 160 | builder.add_node(('key', 'key2'), 'data', ([], )) |
| 2070 | 159 | stream = builder.finish() | 161 | stream = builder.finish() |
| 2071 | 160 | contents = stream.read() | 162 | contents = stream.read() |
| 2072 | @@ -164,7 +166,7 @@ | |||
| 2073 | 164 | "\n", contents) | 166 | "\n", contents) |
| 2074 | 165 | 167 | ||
| 2075 | 166 | def test_build_index_reference_lists_are_included_two(self): | 168 | def test_build_index_reference_lists_are_included_two(self): |
| 2077 | 167 | builder = GraphIndexBuilder(reference_lists=2) | 169 | builder = index.GraphIndexBuilder(reference_lists=2) |
| 2078 | 168 | builder.add_node(('key', ), 'data', ([], [])) | 170 | builder.add_node(('key', ), 'data', ([], [])) |
| 2079 | 169 | stream = builder.finish() | 171 | stream = builder.finish() |
| 2080 | 170 | contents = stream.read() | 172 | contents = stream.read() |
| 2081 | @@ -174,12 +176,12 @@ | |||
| 2082 | 174 | "\n", contents) | 176 | "\n", contents) |
| 2083 | 175 | 177 | ||
| 2084 | 176 | def test_clear_cache(self): | 178 | def test_clear_cache(self): |
| 2086 | 177 | builder = GraphIndexBuilder(reference_lists=2) | 179 | builder = index.GraphIndexBuilder(reference_lists=2) |
| 2087 | 178 | # This is a no-op, but the api should exist | 180 | # This is a no-op, but the api should exist |
| 2088 | 179 | builder.clear_cache() | 181 | builder.clear_cache() |
| 2089 | 180 | 182 | ||
| 2090 | 181 | def test_node_references_are_byte_offsets(self): | 183 | def test_node_references_are_byte_offsets(self): |
| 2092 | 182 | builder = GraphIndexBuilder(reference_lists=1) | 184 | builder = index.GraphIndexBuilder(reference_lists=1) |
| 2093 | 183 | builder.add_node(('reference', ), 'data', ([], )) | 185 | builder.add_node(('reference', ), 'data', ([], )) |
| 2094 | 184 | builder.add_node(('key', ), 'data', ([('reference', )], )) | 186 | builder.add_node(('key', ), 'data', ([('reference', )], )) |
| 2095 | 185 | stream = builder.finish() | 187 | stream = builder.finish() |
| 2096 | @@ -191,10 +193,11 @@ | |||
| 2097 | 191 | "\n", contents) | 193 | "\n", contents) |
| 2098 | 192 | 194 | ||
| 2099 | 193 | def test_node_references_are_cr_delimited(self): | 195 | def test_node_references_are_cr_delimited(self): |
| 2101 | 194 | builder = GraphIndexBuilder(reference_lists=1) | 196 | builder = index.GraphIndexBuilder(reference_lists=1) |
| 2102 | 195 | builder.add_node(('reference', ), 'data', ([], )) | 197 | builder.add_node(('reference', ), 'data', ([], )) |
| 2103 | 196 | builder.add_node(('reference2', ), 'data', ([], )) | 198 | builder.add_node(('reference2', ), 'data', ([], )) |
| 2105 | 197 | builder.add_node(('key', ), 'data', ([('reference', ), ('reference2', )], )) | 199 | builder.add_node(('key', ), 'data', |
| 2106 | 200 | ([('reference', ), ('reference2', )], )) | ||
| 2107 | 198 | stream = builder.finish() | 201 | stream = builder.finish() |
| 2108 | 199 | contents = stream.read() | 202 | contents = stream.read() |
| 2109 | 200 | self.assertEqual( | 203 | self.assertEqual( |
| 2110 | @@ -205,9 +208,10 @@ | |||
| 2111 | 205 | "\n", contents) | 208 | "\n", contents) |
| 2112 | 206 | 209 | ||
| 2113 | 207 | def test_multiple_reference_lists_are_tab_delimited(self): | 210 | def test_multiple_reference_lists_are_tab_delimited(self): |
| 2115 | 208 | builder = GraphIndexBuilder(reference_lists=2) | 211 | builder = index.GraphIndexBuilder(reference_lists=2) |
| 2116 | 209 | builder.add_node(('keference', ), 'data', ([], [])) | 212 | builder.add_node(('keference', ), 'data', ([], [])) |
| 2118 | 210 | builder.add_node(('rey', ), 'data', ([('keference', )], [('keference', )])) | 213 | builder.add_node(('rey', ), 'data', |
| 2119 | 214 | ([('keference', )], [('keference', )])) | ||
| 2120 | 211 | stream = builder.finish() | 215 | stream = builder.finish() |
| 2121 | 212 | contents = stream.read() | 216 | contents = stream.read() |
| 2122 | 213 | self.assertEqual( | 217 | self.assertEqual( |
| 2123 | @@ -217,8 +221,9 @@ | |||
| 2124 | 217 | "\n", contents) | 221 | "\n", contents) |
| 2125 | 218 | 222 | ||
| 2126 | 219 | def test_add_node_referencing_missing_key_makes_absent(self): | 223 | def test_add_node_referencing_missing_key_makes_absent(self): |
| 2129 | 220 | builder = GraphIndexBuilder(reference_lists=1) | 224 | builder = index.GraphIndexBuilder(reference_lists=1) |
| 2130 | 221 | builder.add_node(('rey', ), 'data', ([('beference', ), ('aeference2', )], )) | 225 | builder.add_node(('rey', ), 'data', |
| 2131 | 226 | ([('beference', ), ('aeference2', )], )) | ||
| 2132 | 222 | stream = builder.finish() | 227 | stream = builder.finish() |
| 2133 | 223 | contents = stream.read() | 228 | contents = stream.read() |
| 2134 | 224 | self.assertEqual( | 229 | self.assertEqual( |
| 2135 | @@ -230,7 +235,7 @@ | |||
| 2136 | 230 | 235 | ||
| 2137 | 231 | def test_node_references_three_digits(self): | 236 | def test_node_references_three_digits(self): |
| 2138 | 232 | # test the node digit expands as needed. | 237 | # test the node digit expands as needed. |
| 2140 | 233 | builder = GraphIndexBuilder(reference_lists=1) | 238 | builder = index.GraphIndexBuilder(reference_lists=1) |
| 2141 | 234 | references = [(str(val), ) for val in reversed(range(9))] | 239 | references = [(str(val), ) for val in reversed(range(9))] |
| 2142 | 235 | builder.add_node(('2-key', ), '', (references, )) | 240 | builder.add_node(('2-key', ), '', (references, )) |
| 2143 | 236 | stream = builder.finish() | 241 | stream = builder.finish() |
| 2144 | @@ -252,7 +257,7 @@ | |||
| 2145 | 252 | def test_absent_has_no_reference_overhead(self): | 257 | def test_absent_has_no_reference_overhead(self): |
| 2146 | 253 | # the offsets after an absent record should be correct when there are | 258 | # the offsets after an absent record should be correct when there are |
| 2147 | 254 | # >1 reference lists. | 259 | # >1 reference lists. |
| 2149 | 255 | builder = GraphIndexBuilder(reference_lists=2) | 260 | builder = index.GraphIndexBuilder(reference_lists=2) |
| 2150 | 256 | builder.add_node(('parent', ), '', ([('aail', ), ('zther', )], [])) | 261 | builder.add_node(('parent', ), '', ([('aail', ), ('zther', )], [])) |
| 2151 | 257 | stream = builder.finish() | 262 | stream = builder.finish() |
| 2152 | 258 | contents = stream.read() | 263 | contents = stream.read() |
| 2153 | @@ -264,7 +269,7 @@ | |||
| 2154 | 264 | "\n", contents) | 269 | "\n", contents) |
| 2155 | 265 | 270 | ||
| 2156 | 266 | def test_add_node_bad_key(self): | 271 | def test_add_node_bad_key(self): |
| 2158 | 267 | builder = GraphIndexBuilder() | 272 | builder = index.GraphIndexBuilder() |
| 2159 | 268 | for bad_char in '\t\n\x0b\x0c\r\x00 ': | 273 | for bad_char in '\t\n\x0b\x0c\r\x00 ': |
| 2160 | 269 | self.assertRaises(errors.BadIndexKey, builder.add_node, | 274 | self.assertRaises(errors.BadIndexKey, builder.add_node, |
| 2161 | 270 | ('a%skey' % bad_char, ), 'data') | 275 | ('a%skey' % bad_char, ), 'data') |
| 2162 | @@ -279,30 +284,30 @@ | |||
| 2163 | 279 | self.assertRaises(errors.BadIndexKey, builder.add_node, | 284 | self.assertRaises(errors.BadIndexKey, builder.add_node, |
| 2164 | 280 | ('primary', 'secondary'), 'data') | 285 | ('primary', 'secondary'), 'data') |
| 2165 | 281 | # secondary key elements get checked too: | 286 | # secondary key elements get checked too: |
| 2167 | 282 | builder = GraphIndexBuilder(key_elements=2) | 287 | builder = index.GraphIndexBuilder(key_elements=2) |
| 2168 | 283 | for bad_char in '\t\n\x0b\x0c\r\x00 ': | 288 | for bad_char in '\t\n\x0b\x0c\r\x00 ': |
| 2169 | 284 | self.assertRaises(errors.BadIndexKey, builder.add_node, | 289 | self.assertRaises(errors.BadIndexKey, builder.add_node, |
| 2170 | 285 | ('prefix', 'a%skey' % bad_char), 'data') | 290 | ('prefix', 'a%skey' % bad_char), 'data') |
| 2171 | 286 | 291 | ||
| 2172 | 287 | def test_add_node_bad_data(self): | 292 | def test_add_node_bad_data(self): |
| 2174 | 288 | builder = GraphIndexBuilder() | 293 | builder = index.GraphIndexBuilder() |
| 2175 | 289 | self.assertRaises(errors.BadIndexValue, builder.add_node, ('akey', ), | 294 | self.assertRaises(errors.BadIndexValue, builder.add_node, ('akey', ), |
| 2176 | 290 | 'data\naa') | 295 | 'data\naa') |
| 2177 | 291 | self.assertRaises(errors.BadIndexValue, builder.add_node, ('akey', ), | 296 | self.assertRaises(errors.BadIndexValue, builder.add_node, ('akey', ), |
| 2178 | 292 | 'data\x00aa') | 297 | 'data\x00aa') |
| 2179 | 293 | 298 | ||
| 2180 | 294 | def test_add_node_bad_mismatched_ref_lists_length(self): | 299 | def test_add_node_bad_mismatched_ref_lists_length(self): |
| 2182 | 295 | builder = GraphIndexBuilder() | 300 | builder = index.GraphIndexBuilder() |
| 2183 | 296 | self.assertRaises(errors.BadIndexValue, builder.add_node, ('akey', ), | 301 | self.assertRaises(errors.BadIndexValue, builder.add_node, ('akey', ), |
| 2184 | 297 | 'data aa', ([], )) | 302 | 'data aa', ([], )) |
| 2186 | 298 | builder = GraphIndexBuilder(reference_lists=1) | 303 | builder = index.GraphIndexBuilder(reference_lists=1) |
| 2187 | 299 | self.assertRaises(errors.BadIndexValue, builder.add_node, ('akey', ), | 304 | self.assertRaises(errors.BadIndexValue, builder.add_node, ('akey', ), |
| 2188 | 300 | 'data aa') | 305 | 'data aa') |
| 2189 | 301 | self.assertRaises(errors.BadIndexValue, builder.add_node, ('akey', ), | 306 | self.assertRaises(errors.BadIndexValue, builder.add_node, ('akey', ), |
| 2190 | 302 | 'data aa', (), ) | 307 | 'data aa', (), ) |
| 2191 | 303 | self.assertRaises(errors.BadIndexValue, builder.add_node, ('akey', ), | 308 | self.assertRaises(errors.BadIndexValue, builder.add_node, ('akey', ), |
| 2192 | 304 | 'data aa', ([], [])) | 309 | 'data aa', ([], [])) |
| 2194 | 305 | builder = GraphIndexBuilder(reference_lists=2) | 310 | builder = index.GraphIndexBuilder(reference_lists=2) |
| 2195 | 306 | self.assertRaises(errors.BadIndexValue, builder.add_node, ('akey', ), | 311 | self.assertRaises(errors.BadIndexValue, builder.add_node, ('akey', ), |
| 2196 | 307 | 'data aa') | 312 | 'data aa') |
| 2197 | 308 | self.assertRaises(errors.BadIndexValue, builder.add_node, ('akey', ), | 313 | self.assertRaises(errors.BadIndexValue, builder.add_node, ('akey', ), |
| 2198 | @@ -312,7 +317,7 @@ | |||
| 2199 | 312 | 317 | ||
| 2200 | 313 | def test_add_node_bad_key_in_reference_lists(self): | 318 | def test_add_node_bad_key_in_reference_lists(self): |
| 2201 | 314 | # first list, first key - trivial | 319 | # first list, first key - trivial |
| 2203 | 315 | builder = GraphIndexBuilder(reference_lists=1) | 320 | builder = index.GraphIndexBuilder(reference_lists=1) |
| 2204 | 316 | self.assertRaises(errors.BadIndexKey, builder.add_node, ('akey', ), | 321 | self.assertRaises(errors.BadIndexKey, builder.add_node, ('akey', ), |
| 2205 | 317 | 'data aa', ([('a key', )], )) | 322 | 'data aa', ([('a key', )], )) |
| 2206 | 318 | # references keys must be tuples too | 323 | # references keys must be tuples too |
| 2207 | @@ -329,41 +334,41 @@ | |||
| 2208 | 329 | 'data aa', ([('agoodkey', ), ('that is a bad key', )], )) | 334 | 'data aa', ([('agoodkey', ), ('that is a bad key', )], )) |
| 2209 | 330 | # and if there is more than one list it should be getting checked | 335 | # and if there is more than one list it should be getting checked |
| 2210 | 331 | # too | 336 | # too |
| 2212 | 332 | builder = GraphIndexBuilder(reference_lists=2) | 337 | builder = index.GraphIndexBuilder(reference_lists=2) |
| 2213 | 333 | self.assertRaises(errors.BadIndexKey, builder.add_node, ('akey', ), | 338 | self.assertRaises(errors.BadIndexKey, builder.add_node, ('akey', ), |
| 2214 | 334 | 'data aa', ([], ['a bad key'])) | 339 | 'data aa', ([], ['a bad key'])) |
| 2215 | 335 | 340 | ||
| 2216 | 336 | def test_add_duplicate_key(self): | 341 | def test_add_duplicate_key(self): |
| 2218 | 337 | builder = GraphIndexBuilder() | 342 | builder = index.GraphIndexBuilder() |
| 2219 | 338 | builder.add_node(('key', ), 'data') | 343 | builder.add_node(('key', ), 'data') |
| 2222 | 339 | self.assertRaises(errors.BadIndexDuplicateKey, builder.add_node, ('key', ), | 344 | self.assertRaises(errors.BadIndexDuplicateKey, |
| 2223 | 340 | 'data') | 345 | builder.add_node, ('key', ), 'data') |
| 2224 | 341 | 346 | ||
| 2225 | 342 | def test_add_duplicate_key_2_elements(self): | 347 | def test_add_duplicate_key_2_elements(self): |
| 2227 | 343 | builder = GraphIndexBuilder(key_elements=2) | 348 | builder = index.GraphIndexBuilder(key_elements=2) |
| 2228 | 344 | builder.add_node(('key', 'key'), 'data') | 349 | builder.add_node(('key', 'key'), 'data') |
| 2229 | 345 | self.assertRaises(errors.BadIndexDuplicateKey, builder.add_node, | 350 | self.assertRaises(errors.BadIndexDuplicateKey, builder.add_node, |
| 2230 | 346 | ('key', 'key'), 'data') | 351 | ('key', 'key'), 'data') |
| 2231 | 347 | 352 | ||
| 2232 | 348 | def test_add_key_after_referencing_key(self): | 353 | def test_add_key_after_referencing_key(self): |
| 2234 | 349 | builder = GraphIndexBuilder(reference_lists=1) | 354 | builder = index.GraphIndexBuilder(reference_lists=1) |
| 2235 | 350 | builder.add_node(('key', ), 'data', ([('reference', )], )) | 355 | builder.add_node(('key', ), 'data', ([('reference', )], )) |
| 2236 | 351 | builder.add_node(('reference', ), 'data', ([],)) | 356 | builder.add_node(('reference', ), 'data', ([],)) |
| 2237 | 352 | 357 | ||
| 2238 | 353 | def test_add_key_after_referencing_key_2_elements(self): | 358 | def test_add_key_after_referencing_key_2_elements(self): |
| 2240 | 354 | builder = GraphIndexBuilder(reference_lists=1, key_elements=2) | 359 | builder = index.GraphIndexBuilder(reference_lists=1, key_elements=2) |
| 2241 | 355 | builder.add_node(('k', 'ey'), 'data', ([('reference', 'tokey')], )) | 360 | builder.add_node(('k', 'ey'), 'data', ([('reference', 'tokey')], )) |
| 2242 | 356 | builder.add_node(('reference', 'tokey'), 'data', ([],)) | 361 | builder.add_node(('reference', 'tokey'), 'data', ([],)) |
| 2243 | 357 | 362 | ||
| 2244 | 358 | def test_set_optimize(self): | 363 | def test_set_optimize(self): |
| 2246 | 359 | builder = GraphIndexBuilder(reference_lists=1, key_elements=2) | 364 | builder = index.GraphIndexBuilder(reference_lists=1, key_elements=2) |
| 2247 | 360 | builder.set_optimize(for_size=True) | 365 | builder.set_optimize(for_size=True) |
| 2248 | 361 | self.assertTrue(builder._optimize_for_size) | 366 | self.assertTrue(builder._optimize_for_size) |
| 2249 | 362 | builder.set_optimize(for_size=False) | 367 | builder.set_optimize(for_size=False) |
| 2250 | 363 | self.assertFalse(builder._optimize_for_size) | 368 | self.assertFalse(builder._optimize_for_size) |
| 2251 | 364 | 369 | ||
| 2252 | 365 | 370 | ||
| 2254 | 366 | class TestGraphIndex(TestCaseWithMemoryTransport): | 371 | class TestGraphIndex(tests.TestCaseWithMemoryTransport): |
| 2255 | 367 | 372 | ||
| 2256 | 368 | def make_key(self, number): | 373 | def make_key(self, number): |
| 2257 | 369 | return (str(number) + 'X'*100,) | 374 | return (str(number) + 'X'*100,) |
| 2258 | @@ -380,24 +385,24 @@ | |||
| 2259 | 380 | return nodes | 385 | return nodes |
| 2260 | 381 | 386 | ||
| 2261 | 382 | def make_index(self, ref_lists=0, key_elements=1, nodes=[]): | 387 | def make_index(self, ref_lists=0, key_elements=1, nodes=[]): |
| 2263 | 383 | builder = GraphIndexBuilder(ref_lists, key_elements=key_elements) | 388 | builder = index.GraphIndexBuilder(ref_lists, key_elements=key_elements) |
| 2264 | 384 | for key, value, references in nodes: | 389 | for key, value, references in nodes: |
| 2265 | 385 | builder.add_node(key, value, references) | 390 | builder.add_node(key, value, references) |
| 2266 | 386 | stream = builder.finish() | 391 | stream = builder.finish() |
| 2268 | 387 | trans = get_transport('trace+' + self.get_url()) | 392 | trans = transport.get_transport('trace+' + self.get_url()) |
| 2269 | 388 | size = trans.put_file('index', stream) | 393 | size = trans.put_file('index', stream) |
| 2271 | 389 | return GraphIndex(trans, 'index', size) | 394 | return index.GraphIndex(trans, 'index', size) |
| 2272 | 390 | 395 | ||
| 2273 | 391 | def make_index_with_offset(self, ref_lists=0, key_elements=1, nodes=[], | 396 | def make_index_with_offset(self, ref_lists=0, key_elements=1, nodes=[], |
| 2274 | 392 | offset=0): | 397 | offset=0): |
| 2276 | 393 | builder = GraphIndexBuilder(ref_lists, key_elements=key_elements) | 398 | builder = index.GraphIndexBuilder(ref_lists, key_elements=key_elements) |
| 2277 | 394 | for key, value, references in nodes: | 399 | for key, value, references in nodes: |
| 2278 | 395 | builder.add_node(key, value, references) | 400 | builder.add_node(key, value, references) |
| 2279 | 396 | content = builder.finish().read() | 401 | content = builder.finish().read() |
| 2280 | 397 | size = len(content) | 402 | size = len(content) |
| 2281 | 398 | trans = self.get_transport() | 403 | trans = self.get_transport() |
| 2282 | 399 | trans.put_bytes('index', (' '*offset) + content) | 404 | trans.put_bytes('index', (' '*offset) + content) |
| 2284 | 400 | return GraphIndex(trans, 'index', size, offset=offset) | 405 | return index.GraphIndex(trans, 'index', size, offset=offset) |
| 2285 | 401 | 406 | ||
| 2286 | 402 | def test_clear_cache(self): | 407 | def test_clear_cache(self): |
| 2287 | 403 | index = self.make_index() | 408 | index = self.make_index() |
| 2288 | @@ -408,18 +413,18 @@ | |||
| 2289 | 408 | def test_open_bad_index_no_error(self): | 413 | def test_open_bad_index_no_error(self): |
| 2290 | 409 | trans = self.get_transport() | 414 | trans = self.get_transport() |
| 2291 | 410 | trans.put_bytes('name', "not an index\n") | 415 | trans.put_bytes('name', "not an index\n") |
| 2293 | 411 | index = GraphIndex(trans, 'name', 13) | 416 | idx = index.GraphIndex(trans, 'name', 13) |
| 2294 | 412 | 417 | ||
| 2295 | 413 | def test_with_offset(self): | 418 | def test_with_offset(self): |
| 2296 | 414 | nodes = self.make_nodes(200) | 419 | nodes = self.make_nodes(200) |
| 2299 | 415 | index = self.make_index_with_offset(offset=1234567, nodes=nodes) | 420 | idx = self.make_index_with_offset(offset=1234567, nodes=nodes) |
| 2300 | 416 | self.assertEqual(200, index.key_count()) | 421 | self.assertEqual(200, idx.key_count()) |
| 2301 | 417 | 422 | ||
| 2302 | 418 | def test_buffer_all_with_offset(self): | 423 | def test_buffer_all_with_offset(self): |
| 2303 | 419 | nodes = self.make_nodes(200) | 424 | nodes = self.make_nodes(200) |
| 2307 | 420 | index = self.make_index_with_offset(offset=1234567, nodes=nodes) | 425 | idx = self.make_index_with_offset(offset=1234567, nodes=nodes) |
| 2308 | 421 | index._buffer_all() | 426 | idx._buffer_all() |
| 2309 | 422 | self.assertEqual(200, index.key_count()) | 427 | self.assertEqual(200, idx.key_count()) |
| 2310 | 423 | 428 | ||
| 2311 | 424 | def test_side_effect_buffering_with_offset(self): | 429 | def test_side_effect_buffering_with_offset(self): |
| 2312 | 425 | nodes = self.make_nodes(20) | 430 | nodes = self.make_nodes(20) |
| 2313 | @@ -830,9 +835,9 @@ | |||
| 2314 | 830 | self.assertEqual([], list(index.iter_entries([('a', )]))) | 835 | self.assertEqual([], list(index.iter_entries([('a', )]))) |
| 2315 | 831 | 836 | ||
| 2316 | 832 | def test_iter_missing_entry_empty_no_size(self): | 837 | def test_iter_missing_entry_empty_no_size(self): |
| 2320 | 833 | index = self.make_index() | 838 | idx = self.make_index() |
| 2321 | 834 | index = GraphIndex(index._transport, 'index', None) | 839 | idx = index.GraphIndex(idx._transport, 'index', None) |
| 2322 | 835 | self.assertEqual([], list(index.iter_entries([('a', )]))) | 840 | self.assertEqual([], list(idx.iter_entries([('a', )]))) |
| 2323 | 836 | 841 | ||
| 2324 | 837 | def test_iter_key_prefix_1_element_key_None(self): | 842 | def test_iter_key_prefix_1_element_key_None(self): |
| 2325 | 838 | index = self.make_index() | 843 | index = self.make_index() |
| 2326 | @@ -928,17 +933,17 @@ | |||
| 2327 | 928 | def test_validate_bad_index_errors(self): | 933 | def test_validate_bad_index_errors(self): |
| 2328 | 929 | trans = self.get_transport() | 934 | trans = self.get_transport() |
| 2329 | 930 | trans.put_bytes('name', "not an index\n") | 935 | trans.put_bytes('name', "not an index\n") |
| 2332 | 931 | index = GraphIndex(trans, 'name', 13) | 936 | idx = index.GraphIndex(trans, 'name', 13) |
| 2333 | 932 | self.assertRaises(errors.BadIndexFormatSignature, index.validate) | 937 | self.assertRaises(errors.BadIndexFormatSignature, idx.validate) |
| 2334 | 933 | 938 | ||
| 2335 | 934 | def test_validate_bad_node_refs(self): | 939 | def test_validate_bad_node_refs(self): |
| 2337 | 935 | index = self.make_index(2) | 940 | idx = self.make_index(2) |
| 2338 | 936 | trans = self.get_transport() | 941 | trans = self.get_transport() |
| 2339 | 937 | content = trans.get_bytes('index') | 942 | content = trans.get_bytes('index') |
| 2340 | 938 | # change the options line to end with a rather than a parseable number | 943 | # change the options line to end with a rather than a parseable number |
| 2341 | 939 | new_content = content[:-2] + 'a\n\n' | 944 | new_content = content[:-2] + 'a\n\n' |
| 2342 | 940 | trans.put_bytes('index', new_content) | 945 | trans.put_bytes('index', new_content) |
| 2344 | 941 | self.assertRaises(errors.BadIndexOptions, index.validate) | 946 | self.assertRaises(errors.BadIndexOptions, idx.validate) |
| 2345 | 942 | 947 | ||
| 2346 | 943 | def test_validate_missing_end_line_empty(self): | 948 | def test_validate_missing_end_line_empty(self): |
| 2347 | 944 | index = self.make_index(2) | 949 | index = self.make_index(2) |
| 2348 | @@ -1049,25 +1054,25 @@ | |||
| 2349 | 1049 | self.assertEqual(set(), search_keys) | 1054 | self.assertEqual(set(), search_keys) |
| 2350 | 1050 | 1055 | ||
| 2351 | 1051 | def test_supports_unlimited_cache(self): | 1056 | def test_supports_unlimited_cache(self): |
| 2353 | 1052 | builder = GraphIndexBuilder(0, key_elements=1) | 1057 | builder = index.GraphIndexBuilder(0, key_elements=1) |
| 2354 | 1053 | stream = builder.finish() | 1058 | stream = builder.finish() |
| 2356 | 1054 | trans = get_transport(self.get_url()) | 1059 | trans = transport.get_transport(self.get_url()) |
| 2357 | 1055 | size = trans.put_file('index', stream) | 1060 | size = trans.put_file('index', stream) |
| 2358 | 1056 | # It doesn't matter what unlimited_cache does here, just that it can be | 1061 | # It doesn't matter what unlimited_cache does here, just that it can be |
| 2359 | 1057 | # passed | 1062 | # passed |
| 2364 | 1058 | index = GraphIndex(trans, 'index', size, unlimited_cache=True) | 1063 | idx = index.GraphIndex(trans, 'index', size, unlimited_cache=True) |
| 2365 | 1059 | 1064 | ||
| 2366 | 1060 | 1065 | ||
| 2367 | 1061 | class TestCombinedGraphIndex(TestCaseWithMemoryTransport): | 1066 | class TestCombinedGraphIndex(tests.TestCaseWithMemoryTransport): |
| 2368 | 1062 | 1067 | ||
| 2369 | 1063 | def make_index(self, name, ref_lists=0, key_elements=1, nodes=[]): | 1068 | def make_index(self, name, ref_lists=0, key_elements=1, nodes=[]): |
| 2371 | 1064 | builder = GraphIndexBuilder(ref_lists, key_elements=key_elements) | 1069 | builder = index.GraphIndexBuilder(ref_lists, key_elements=key_elements) |
| 2372 | 1065 | for key, value, references in nodes: | 1070 | for key, value, references in nodes: |
| 2373 | 1066 | builder.add_node(key, value, references) | 1071 | builder.add_node(key, value, references) |
| 2374 | 1067 | stream = builder.finish() | 1072 | stream = builder.finish() |
| 2375 | 1068 | trans = self.get_transport() | 1073 | trans = self.get_transport() |
| 2376 | 1069 | size = trans.put_file(name, stream) | 1074 | size = trans.put_file(name, stream) |
| 2378 | 1070 | return GraphIndex(trans, name, size) | 1075 | return index.GraphIndex(trans, name, size) |
| 2379 | 1071 | 1076 | ||
| 2380 | 1072 | def make_combined_index_with_missing(self, missing=['1', '2']): | 1077 | def make_combined_index_with_missing(self, missing=['1', '2']): |
| 2381 | 1073 | """Create a CombinedGraphIndex which will have missing indexes. | 1078 | """Create a CombinedGraphIndex which will have missing indexes. |
| 2382 | @@ -1079,9 +1084,9 @@ | |||
| 2383 | 1079 | :param missing: The underlying indexes to delete | 1084 | :param missing: The underlying indexes to delete |
| 2384 | 1080 | :return: (CombinedGraphIndex, reload_counter) | 1085 | :return: (CombinedGraphIndex, reload_counter) |
| 2385 | 1081 | """ | 1086 | """ |
| 2389 | 1082 | index1 = self.make_index('1', nodes=[(('1',), '', ())]) | 1087 | idx1 = self.make_index('1', nodes=[(('1',), '', ())]) |
| 2390 | 1083 | index2 = self.make_index('2', nodes=[(('2',), '', ())]) | 1088 | idx2 = self.make_index('2', nodes=[(('2',), '', ())]) |
| 2391 | 1084 | index3 = self.make_index('3', nodes=[ | 1089 | idx3 = self.make_index('3', nodes=[ |
| 2392 | 1085 | (('1',), '', ()), | 1090 | (('1',), '', ()), |
| 2393 | 1086 | (('2',), '', ())]) | 1091 | (('2',), '', ())]) |
| 2394 | 1087 | 1092 | ||
| 2395 | @@ -1089,29 +1094,30 @@ | |||
| 2396 | 1089 | reload_counter = [0, 0, 0] | 1094 | reload_counter = [0, 0, 0] |
| 2397 | 1090 | def reload(): | 1095 | def reload(): |
| 2398 | 1091 | reload_counter[0] += 1 | 1096 | reload_counter[0] += 1 |
| 2401 | 1092 | new_indices = [index3] | 1097 | new_indices = [idx3] |
| 2402 | 1093 | if index._indices == new_indices: | 1098 | if idx._indices == new_indices: |
| 2403 | 1094 | reload_counter[2] += 1 | 1099 | reload_counter[2] += 1 |
| 2404 | 1095 | return False | 1100 | return False |
| 2405 | 1096 | reload_counter[1] += 1 | 1101 | reload_counter[1] += 1 |
| 2407 | 1097 | index._indices[:] = new_indices | 1102 | idx._indices[:] = new_indices |
| 2408 | 1098 | return True | 1103 | return True |
| 2410 | 1099 | index = CombinedGraphIndex([index1, index2], reload_func=reload) | 1104 | idx = index.CombinedGraphIndex([idx1, idx2], reload_func=reload) |
| 2411 | 1100 | trans = self.get_transport() | 1105 | trans = self.get_transport() |
| 2412 | 1101 | for fname in missing: | 1106 | for fname in missing: |
| 2413 | 1102 | trans.delete(fname) | 1107 | trans.delete(fname) |
| 2415 | 1103 | return index, reload_counter | 1108 | return idx, reload_counter |
| 2416 | 1104 | 1109 | ||
| 2417 | 1105 | def test_open_missing_index_no_error(self): | 1110 | def test_open_missing_index_no_error(self): |
| 2418 | 1106 | trans = self.get_transport() | 1111 | trans = self.get_transport() |
| 2421 | 1107 | index1 = GraphIndex(trans, 'missing', 100) | 1112 | idx1 = index.GraphIndex(trans, 'missing', 100) |
| 2422 | 1108 | index = CombinedGraphIndex([index1]) | 1113 | idx = index.CombinedGraphIndex([idx1]) |
| 2423 | 1109 | 1114 | ||
| 2424 | 1110 | def test_add_index(self): | 1115 | def test_add_index(self): |
| 2429 | 1111 | index = CombinedGraphIndex([]) | 1116 | idx = index.CombinedGraphIndex([]) |
| 2430 | 1112 | index1 = self.make_index('name', 0, nodes=[(('key', ), '', ())]) | 1117 | idx1 = self.make_index('name', 0, nodes=[(('key', ), '', ())]) |
| 2431 | 1113 | index.insert_index(0, index1) | 1118 | idx.insert_index(0, idx1) |
| 2432 | 1114 | self.assertEqual([(index1, ('key', ), '')], list(index.iter_all_entries())) | 1119 | self.assertEqual([(idx1, ('key', ), '')], |
| 2433 | 1120 | list(idx.iter_all_entries())) | ||
| 2434 | 1115 | 1121 | ||
| 2435 | 1116 | def test_clear_cache(self): | 1122 | def test_clear_cache(self): |
| 2436 | 1117 | log = [] | 1123 | log = [] |
| 2437 | @@ -1128,165 +1134,166 @@ | |||
| 2438 | 1128 | log.append(self._index) | 1134 | log.append(self._index) |
| 2439 | 1129 | return self._index.clear_cache() | 1135 | return self._index.clear_cache() |
| 2440 | 1130 | 1136 | ||
| 2446 | 1131 | index = CombinedGraphIndex([]) | 1137 | idx = index.CombinedGraphIndex([]) |
| 2447 | 1132 | index1 = self.make_index('name', 0, nodes=[(('key', ), '', ())]) | 1138 | idx1 = self.make_index('name', 0, nodes=[(('key', ), '', ())]) |
| 2448 | 1133 | index.insert_index(0, ClearCacheProxy(index1)) | 1139 | idx.insert_index(0, ClearCacheProxy(idx1)) |
| 2449 | 1134 | index2 = self.make_index('name', 0, nodes=[(('key', ), '', ())]) | 1140 | idx2 = self.make_index('name', 0, nodes=[(('key', ), '', ())]) |
| 2450 | 1135 | index.insert_index(1, ClearCacheProxy(index2)) | 1141 | idx.insert_index(1, ClearCacheProxy(idx2)) |
| 2451 | 1136 | # CombinedGraphIndex should call 'clear_cache()' on all children | 1142 | # CombinedGraphIndex should call 'clear_cache()' on all children |
| 2454 | 1137 | index.clear_cache() | 1143 | idx.clear_cache() |
| 2455 | 1138 | self.assertEqual(sorted([index1, index2]), sorted(log)) | 1144 | self.assertEqual(sorted([idx1, idx2]), sorted(log)) |
| 2456 | 1139 | 1145 | ||
| 2457 | 1140 | def test_iter_all_entries_empty(self): | 1146 | def test_iter_all_entries_empty(self): |
| 2460 | 1141 | index = CombinedGraphIndex([]) | 1147 | idx = index.CombinedGraphIndex([]) |
| 2461 | 1142 | self.assertEqual([], list(index.iter_all_entries())) | 1148 | self.assertEqual([], list(idx.iter_all_entries())) |
| 2462 | 1143 | 1149 | ||
| 2463 | 1144 | def test_iter_all_entries_children_empty(self): | 1150 | def test_iter_all_entries_children_empty(self): |
| 2467 | 1145 | index1 = self.make_index('name') | 1151 | idx1 = self.make_index('name') |
| 2468 | 1146 | index = CombinedGraphIndex([index1]) | 1152 | idx = index.CombinedGraphIndex([idx1]) |
| 2469 | 1147 | self.assertEqual([], list(index.iter_all_entries())) | 1153 | self.assertEqual([], list(idx.iter_all_entries())) |
| 2470 | 1148 | 1154 | ||
| 2471 | 1149 | def test_iter_all_entries_simple(self): | 1155 | def test_iter_all_entries_simple(self): |
| 2476 | 1150 | index1 = self.make_index('name', nodes=[(('name', ), 'data', ())]) | 1156 | idx1 = self.make_index('name', nodes=[(('name', ), 'data', ())]) |
| 2477 | 1151 | index = CombinedGraphIndex([index1]) | 1157 | idx = index.CombinedGraphIndex([idx1]) |
| 2478 | 1152 | self.assertEqual([(index1, ('name', ), 'data')], | 1158 | self.assertEqual([(idx1, ('name', ), 'data')], |
| 2479 | 1153 | list(index.iter_all_entries())) | 1159 | list(idx.iter_all_entries())) |
| 2480 | 1154 | 1160 | ||
| 2481 | 1155 | def test_iter_all_entries_two_indices(self): | 1161 | def test_iter_all_entries_two_indices(self): |
| 2488 | 1156 | index1 = self.make_index('name1', nodes=[(('name', ), 'data', ())]) | 1162 | idx1 = self.make_index('name1', nodes=[(('name', ), 'data', ())]) |
| 2489 | 1157 | index2 = self.make_index('name2', nodes=[(('2', ), '', ())]) | 1163 | idx2 = self.make_index('name2', nodes=[(('2', ), '', ())]) |
| 2490 | 1158 | index = CombinedGraphIndex([index1, index2]) | 1164 | idx = index.CombinedGraphIndex([idx1, idx2]) |
| 2491 | 1159 | self.assertEqual([(index1, ('name', ), 'data'), | 1165 | self.assertEqual([(idx1, ('name', ), 'data'), |
| 2492 | 1160 | (index2, ('2', ), '')], | 1166 | (idx2, ('2', ), '')], |
| 2493 | 1161 | list(index.iter_all_entries())) | 1167 | list(idx.iter_all_entries())) |
| 2494 | 1162 | 1168 | ||
| 2495 | 1163 | def test_iter_entries_two_indices_dup_key(self): | 1169 | def test_iter_entries_two_indices_dup_key(self): |
| 2501 | 1164 | index1 = self.make_index('name1', nodes=[(('name', ), 'data', ())]) | 1170 | idx1 = self.make_index('name1', nodes=[(('name', ), 'data', ())]) |
| 2502 | 1165 | index2 = self.make_index('name2', nodes=[(('name', ), 'data', ())]) | 1171 | idx2 = self.make_index('name2', nodes=[(('name', ), 'data', ())]) |
| 2503 | 1166 | index = CombinedGraphIndex([index1, index2]) | 1172 | idx = index.CombinedGraphIndex([idx1, idx2]) |
| 2504 | 1167 | self.assertEqual([(index1, ('name', ), 'data')], | 1173 | self.assertEqual([(idx1, ('name', ), 'data')], |
| 2505 | 1168 | list(index.iter_entries([('name', )]))) | 1174 | list(idx.iter_entries([('name', )]))) |
| 2506 | 1169 | 1175 | ||
| 2507 | 1170 | def test_iter_all_entries_two_indices_dup_key(self): | 1176 | def test_iter_all_entries_two_indices_dup_key(self): |
| 2513 | 1171 | index1 = self.make_index('name1', nodes=[(('name', ), 'data', ())]) | 1177 | idx1 = self.make_index('name1', nodes=[(('name', ), 'data', ())]) |
| 2514 | 1172 | index2 = self.make_index('name2', nodes=[(('name', ), 'data', ())]) | 1178 | idx2 = self.make_index('name2', nodes=[(('name', ), 'data', ())]) |
| 2515 | 1173 | index = CombinedGraphIndex([index1, index2]) | 1179 | idx = index.CombinedGraphIndex([idx1, idx2]) |
| 2516 | 1174 | self.assertEqual([(index1, ('name', ), 'data')], | 1180 | self.assertEqual([(idx1, ('name', ), 'data')], |
| 2517 | 1175 | list(index.iter_all_entries())) | 1181 | list(idx.iter_all_entries())) |
| 2518 | 1176 | 1182 | ||
| 2519 | 1177 | def test_iter_key_prefix_2_key_element_refs(self): | 1183 | def test_iter_key_prefix_2_key_element_refs(self): |
| 2532 | 1178 | index1 = self.make_index('1', 1, key_elements=2, nodes=[ | 1184 | idx1 = self.make_index('1', 1, key_elements=2, nodes=[ |
| 2533 | 1179 | (('name', 'fin1'), 'data', ([('ref', 'erence')], ))]) | 1185 | (('name', 'fin1'), 'data', ([('ref', 'erence')], ))]) |
| 2534 | 1180 | index2 = self.make_index('2', 1, key_elements=2, nodes=[ | 1186 | idx2 = self.make_index('2', 1, key_elements=2, nodes=[ |
| 2535 | 1181 | (('name', 'fin2'), 'beta', ([], )), | 1187 | (('name', 'fin2'), 'beta', ([], )), |
| 2536 | 1182 | (('ref', 'erence'), 'refdata', ([], ))]) | 1188 | (('ref', 'erence'), 'refdata', ([], ))]) |
| 2537 | 1183 | index = CombinedGraphIndex([index1, index2]) | 1189 | idx = index.CombinedGraphIndex([idx1, idx2]) |
| 2538 | 1184 | self.assertEqual(set([(index1, ('name', 'fin1'), 'data', ((('ref', 'erence'),),)), | 1190 | self.assertEqual(set([(idx1, ('name', 'fin1'), 'data', |
| 2539 | 1185 | (index2, ('ref', 'erence'), 'refdata', ((), ))]), | 1191 | ((('ref', 'erence'),),)), |
| 2540 | 1186 | set(index.iter_entries_prefix([('name', 'fin1'), ('ref', 'erence')]))) | 1192 | (idx2, ('ref', 'erence'), 'refdata', ((), ))]), |
| 2541 | 1187 | self.assertEqual(set([(index1, ('name', 'fin1'), 'data', ((('ref', 'erence'),),)), | 1193 | set(idx.iter_entries_prefix([('name', 'fin1'), |
| 2542 | 1188 | (index2, ('name', 'fin2'), 'beta', ((), ))]), | 1194 | ('ref', 'erence')]))) |
| 2543 | 1189 | set(index.iter_entries_prefix([('name', None)]))) | 1195 | self.assertEqual(set([(idx1, ('name', 'fin1'), 'data', |
| 2544 | 1196 | ((('ref', 'erence'),),)), | ||
| 2545 | 1197 | (idx2, ('name', 'fin2'), 'beta', ((), ))]), | ||
| 2546 | 1198 | set(idx.iter_entries_prefix([('name', None)]))) | ||
| 2547 | 1190 | 1199 | ||
| 2548 | 1191 | def test_iter_nothing_empty(self): | 1200 | def test_iter_nothing_empty(self): |
| 2551 | 1192 | index = CombinedGraphIndex([]) | 1201 | idx = index.CombinedGraphIndex([]) |
| 2552 | 1193 | self.assertEqual([], list(index.iter_entries([]))) | 1202 | self.assertEqual([], list(idx.iter_entries([]))) |
| 2553 | 1194 | 1203 | ||
| 2554 | 1195 | def test_iter_nothing_children_empty(self): | 1204 | def test_iter_nothing_children_empty(self): |
| 2558 | 1196 | index1 = self.make_index('name') | 1205 | idx1 = self.make_index('name') |
| 2559 | 1197 | index = CombinedGraphIndex([index1]) | 1206 | idx = index.CombinedGraphIndex([idx1]) |
| 2560 | 1198 | self.assertEqual([], list(index.iter_entries([]))) | 1207 | self.assertEqual([], list(idx.iter_entries([]))) |
| 2561 | 1199 | 1208 | ||
| 2562 | 1200 | def test_iter_all_keys(self): | 1209 | def test_iter_all_keys(self): |
| 2571 | 1201 | index1 = self.make_index('1', 1, nodes=[ | 1210 | idx1 = self.make_index('1', 1, nodes=[(('name', ), 'data', |
| 2572 | 1202 | (('name', ), 'data', ([('ref', )], ))]) | 1211 | ([('ref', )], ))]) |
| 2573 | 1203 | index2 = self.make_index('2', 1, nodes=[ | 1212 | idx2 = self.make_index('2', 1, nodes=[(('ref', ), 'refdata', ((), ))]) |
| 2574 | 1204 | (('ref', ), 'refdata', ((), ))]) | 1213 | idx = index.CombinedGraphIndex([idx1, idx2]) |
| 2575 | 1205 | index = CombinedGraphIndex([index1, index2]) | 1214 | self.assertEqual(set([(idx1, ('name', ), 'data', ((('ref', ), ), )), |
| 2576 | 1206 | self.assertEqual(set([(index1, ('name', ), 'data', ((('ref', ), ), )), | 1215 | (idx2, ('ref', ), 'refdata', ((), ))]), |
| 2577 | 1207 | (index2, ('ref', ), 'refdata', ((), ))]), | 1216 | set(idx.iter_entries([('name', ), ('ref', )]))) |
| 2570 | 1208 | set(index.iter_entries([('name', ), ('ref', )]))) | ||
| 2578 | 1209 | 1217 | ||
| 2579 | 1210 | def test_iter_all_keys_dup_entry(self): | 1218 | def test_iter_all_keys_dup_entry(self): |
| 2589 | 1211 | index1 = self.make_index('1', 1, nodes=[ | 1219 | idx1 = self.make_index('1', 1, nodes=[(('name', ), 'data', |
| 2590 | 1212 | (('name', ), 'data', ([('ref', )], )), | 1220 | ([('ref', )], )), |
| 2591 | 1213 | (('ref', ), 'refdata', ([], ))]) | 1221 | (('ref', ), 'refdata', ([], ))]) |
| 2592 | 1214 | index2 = self.make_index('2', 1, nodes=[ | 1222 | idx2 = self.make_index('2', 1, nodes=[(('ref', ), 'refdata', ([], ))]) |
| 2593 | 1215 | (('ref', ), 'refdata', ([], ))]) | 1223 | idx = index.CombinedGraphIndex([idx1, idx2]) |
| 2594 | 1216 | index = CombinedGraphIndex([index1, index2]) | 1224 | self.assertEqual(set([(idx1, ('name', ), 'data', ((('ref',),),)), |
| 2595 | 1217 | self.assertEqual(set([(index1, ('name', ), 'data', ((('ref',),),)), | 1225 | (idx1, ('ref', ), 'refdata', ((), ))]), |
| 2596 | 1218 | (index1, ('ref', ), 'refdata', ((), ))]), | 1226 | set(idx.iter_entries([('name', ), ('ref', )]))) |
| 2588 | 1219 | set(index.iter_entries([('name', ), ('ref', )]))) | ||
| 2597 | 1220 | 1227 | ||
| 2598 | 1221 | def test_iter_missing_entry_empty(self): | 1228 | def test_iter_missing_entry_empty(self): |
| 2601 | 1222 | index = CombinedGraphIndex([]) | 1229 | idx = index.CombinedGraphIndex([]) |
| 2602 | 1223 | self.assertEqual([], list(index.iter_entries([('a', )]))) | 1230 | self.assertEqual([], list(idx.iter_entries([('a', )]))) |
| 2603 | 1224 | 1231 | ||
| 2604 | 1225 | def test_iter_missing_entry_one_index(self): | 1232 | def test_iter_missing_entry_one_index(self): |
| 2608 | 1226 | index1 = self.make_index('1') | 1233 | idx1 = self.make_index('1') |
| 2609 | 1227 | index = CombinedGraphIndex([index1]) | 1234 | idx = index.CombinedGraphIndex([idx1]) |
| 2610 | 1228 | self.assertEqual([], list(index.iter_entries([('a', )]))) | 1235 | self.assertEqual([], list(idx.iter_entries([('a', )]))) |
| 2611 | 1229 | 1236 | ||
| 2612 | 1230 | def test_iter_missing_entry_two_index(self): | 1237 | def test_iter_missing_entry_two_index(self): |
| 2617 | 1231 | index1 = self.make_index('1') | 1238 | idx1 = self.make_index('1') |
| 2618 | 1232 | index2 = self.make_index('2') | 1239 | idx2 = self.make_index('2') |
| 2619 | 1233 | index = CombinedGraphIndex([index1, index2]) | 1240 | idx = index.CombinedGraphIndex([idx1, idx2]) |
| 2620 | 1234 | self.assertEqual([], list(index.iter_entries([('a', )]))) | 1241 | self.assertEqual([], list(idx.iter_entries([('a', )]))) |
| 2621 | 1235 | 1242 | ||
| 2622 | 1236 | def test_iter_entry_present_one_index_only(self): | 1243 | def test_iter_entry_present_one_index_only(self): |
| 2628 | 1237 | index1 = self.make_index('1', nodes=[(('key', ), '', ())]) | 1244 | idx1 = self.make_index('1', nodes=[(('key', ), '', ())]) |
| 2629 | 1238 | index2 = self.make_index('2', nodes=[]) | 1245 | idx2 = self.make_index('2', nodes=[]) |
| 2630 | 1239 | index = CombinedGraphIndex([index1, index2]) | 1246 | idx = index.CombinedGraphIndex([idx1, idx2]) |
| 2631 | 1240 | self.assertEqual([(index1, ('key', ), '')], | 1247 | self.assertEqual([(idx1, ('key', ), '')], |
| 2632 | 1241 | list(index.iter_entries([('key', )]))) | 1248 | list(idx.iter_entries([('key', )]))) |
| 2633 | 1242 | # and in the other direction | 1249 | # and in the other direction |
| 2637 | 1243 | index = CombinedGraphIndex([index2, index1]) | 1250 | idx = index.CombinedGraphIndex([idx2, idx1]) |
| 2638 | 1244 | self.assertEqual([(index1, ('key', ), '')], | 1251 | self.assertEqual([(idx1, ('key', ), '')], |
| 2639 | 1245 | list(index.iter_entries([('key', )]))) | 1252 | list(idx.iter_entries([('key', )]))) |
| 2640 | 1246 | 1253 | ||
| 2641 | 1247 | def test_key_count_empty(self): | 1254 | def test_key_count_empty(self): |
| 2646 | 1248 | index1 = self.make_index('1', nodes=[]) | 1255 | idx1 = self.make_index('1', nodes=[]) |
| 2647 | 1249 | index2 = self.make_index('2', nodes=[]) | 1256 | idx2 = self.make_index('2', nodes=[]) |
| 2648 | 1250 | index = CombinedGraphIndex([index1, index2]) | 1257 | idx = index.CombinedGraphIndex([idx1, idx2]) |
| 2649 | 1251 | self.assertEqual(0, index.key_count()) | 1258 | self.assertEqual(0, idx.key_count()) |
| 2650 | 1252 | 1259 | ||
| 2651 | 1253 | def test_key_count_sums_index_keys(self): | 1260 | def test_key_count_sums_index_keys(self): |
| 2653 | 1254 | index1 = self.make_index('1', nodes=[ | 1261 | idx1 = self.make_index('1', nodes=[ |
| 2654 | 1255 | (('1',), '', ()), | 1262 | (('1',), '', ()), |
| 2655 | 1256 | (('2',), '', ())]) | 1263 | (('2',), '', ())]) |
| 2659 | 1257 | index2 = self.make_index('2', nodes=[(('1',), '', ())]) | 1264 | idx2 = self.make_index('2', nodes=[(('1',), '', ())]) |
| 2660 | 1258 | index = CombinedGraphIndex([index1, index2]) | 1265 | idx = index.CombinedGraphIndex([idx1, idx2]) |
| 2661 | 1259 | self.assertEqual(3, index.key_count()) | 1266 | self.assertEqual(3, idx.key_count()) |
| 2662 | 1260 | 1267 | ||
| 2663 | 1261 | def test_validate_bad_child_index_errors(self): | 1268 | def test_validate_bad_child_index_errors(self): |
| 2664 | 1262 | trans = self.get_transport() | 1269 | trans = self.get_transport() |
| 2665 | 1263 | trans.put_bytes('name', "not an index\n") | 1270 | trans.put_bytes('name', "not an index\n") |
| 2669 | 1264 | index1 = GraphIndex(trans, 'name', 13) | 1271 | idx1 = index.GraphIndex(trans, 'name', 13) |
| 2670 | 1265 | index = CombinedGraphIndex([index1]) | 1272 | idx = index.CombinedGraphIndex([idx1]) |
| 2671 | 1266 | self.assertRaises(errors.BadIndexFormatSignature, index.validate) | 1273 | self.assertRaises(errors.BadIndexFormatSignature, idx.validate) |
| 2672 | 1267 | 1274 | ||
| 2673 | 1268 | def test_validate_empty(self): | 1275 | def test_validate_empty(self): |
| 2676 | 1269 | index = CombinedGraphIndex([]) | 1276 | idx = index.CombinedGraphIndex([]) |
| 2677 | 1270 | index.validate() | 1277 | idx.validate() |
| 2678 | 1271 | 1278 | ||
| 2679 | 1272 | def test_key_count_reloads(self): | 1279 | def test_key_count_reloads(self): |
| 2682 | 1273 | index, reload_counter = self.make_combined_index_with_missing() | 1280 | idx, reload_counter = self.make_combined_index_with_missing() |
| 2683 | 1274 | self.assertEqual(2, index.key_count()) | 1281 | self.assertEqual(2, idx.key_count()) |
| 2684 | 1275 | self.assertEqual([1, 1, 0], reload_counter) | 1282 | self.assertEqual([1, 1, 0], reload_counter) |
| 2685 | 1276 | 1283 | ||
| 2686 | 1277 | def test_key_count_no_reload(self): | 1284 | def test_key_count_no_reload(self): |
| 2689 | 1278 | index, reload_counter = self.make_combined_index_with_missing() | 1285 | idx, reload_counter = self.make_combined_index_with_missing() |
| 2690 | 1279 | index._reload_func = None | 1286 | idx._reload_func = None |
| 2691 | 1280 | # Without a _reload_func we just raise the exception | 1287 | # Without a _reload_func we just raise the exception |
| 2693 | 1281 | self.assertRaises(errors.NoSuchFile, index.key_count) | 1288 | self.assertRaises(errors.NoSuchFile, idx.key_count) |
| 2694 | 1282 | 1289 | ||
| 2695 | 1283 | def test_key_count_reloads_and_fails(self): | 1290 | def test_key_count_reloads_and_fails(self): |
| 2696 | 1284 | # We have deleted all underlying indexes, so we will try to reload, but | 1291 | # We have deleted all underlying indexes, so we will try to reload, but |
| 2697 | 1285 | # still fail. This is mostly to test we don't get stuck in an infinite | 1292 | # still fail. This is mostly to test we don't get stuck in an infinite |
| 2698 | 1286 | # loop trying to reload | 1293 | # loop trying to reload |
| 2702 | 1287 | index, reload_counter = self.make_combined_index_with_missing( | 1294 | idx, reload_counter = self.make_combined_index_with_missing( |
| 2703 | 1288 | ['1', '2', '3']) | 1295 | ['1', '2', '3']) |
| 2704 | 1289 | self.assertRaises(errors.NoSuchFile, index.key_count) | 1296 | self.assertRaises(errors.NoSuchFile, idx.key_count) |
| 2705 | 1290 | self.assertEqual([2, 1, 1], reload_counter) | 1297 | self.assertEqual([2, 1, 1], reload_counter) |
| 2706 | 1291 | 1298 | ||
| 2707 | 1292 | def test_iter_entries_reloads(self): | 1299 | def test_iter_entries_reloads(self): |
| 2708 | @@ -1392,27 +1399,27 @@ | |||
| 2709 | 1392 | return self.make_index('index-%s' % name, 0, nodes=nodes) | 1399 | return self.make_index('index-%s' % name, 0, nodes=nodes) |
| 2710 | 1393 | 1400 | ||
| 2711 | 1394 | def test_reorder_after_iter_entries(self): | 1401 | def test_reorder_after_iter_entries(self): |
| 2722 | 1395 | # Four indices: [key1] in index1, [key2,key3] in index2, [] in index3, | 1402 | # Four indices: [key1] in idx1, [key2,key3] in idx2, [] in idx3, |
| 2723 | 1396 | # [key4] in index4. | 1403 | # [key4] in idx4. |
| 2724 | 1397 | index = CombinedGraphIndex([]) | 1404 | idx = index.CombinedGraphIndex([]) |
| 2725 | 1398 | index.insert_index(0, self.make_index_with_simple_nodes('1'), '1') | 1405 | idx.insert_index(0, self.make_index_with_simple_nodes('1'), '1') |
| 2726 | 1399 | index.insert_index(1, self.make_index_with_simple_nodes('2'), '2') | 1406 | idx.insert_index(1, self.make_index_with_simple_nodes('2'), '2') |
| 2727 | 1400 | index.insert_index(2, self.make_index_with_simple_nodes('3'), '3') | 1407 | idx.insert_index(2, self.make_index_with_simple_nodes('3'), '3') |
| 2728 | 1401 | index.insert_index(3, self.make_index_with_simple_nodes('4'), '4') | 1408 | idx.insert_index(3, self.make_index_with_simple_nodes('4'), '4') |
| 2729 | 1402 | index1, index2, index3, index4 = index._indices | 1409 | idx1, idx2, idx3, idx4 = idx._indices |
| 2730 | 1403 | # Query a key from index4 and index2. | 1410 | # Query a key from idx4 and idx2. |
| 2731 | 1404 | self.assertLength(2, list(index.iter_entries( | 1411 | self.assertLength(2, list(idx.iter_entries( |
| 2732 | 1405 | [('index-4-key-1',), ('index-2-key-1',)]))) | 1412 | [('index-4-key-1',), ('index-2-key-1',)]))) |
| 2737 | 1406 | # Now index2 and index4 should be moved to the front (and index1 should | 1413 | # Now idx2 and idx4 should be moved to the front (and idx1 should |
| 2738 | 1407 | # still be before index3). | 1414 | # still be before idx3). |
| 2739 | 1408 | self.assertEqual([index2, index4, index1, index3], index._indices) | 1415 | self.assertEqual([idx2, idx4, idx1, idx3], idx._indices) |
| 2740 | 1409 | self.assertEqual(['2', '4', '1', '3'], index._index_names) | 1416 | self.assertEqual(['2', '4', '1', '3'], idx._index_names) |
| 2741 | 1410 | 1417 | ||
| 2742 | 1411 | def test_reorder_propagates_to_siblings(self): | 1418 | def test_reorder_propagates_to_siblings(self): |
| 2743 | 1412 | # Two CombinedGraphIndex objects, with the same number of indicies with | 1419 | # Two CombinedGraphIndex objects, with the same number of indicies with |
| 2744 | 1413 | # matching names. | 1420 | # matching names. |
| 2747 | 1414 | cgi1 = CombinedGraphIndex([]) | 1421 | cgi1 = index.CombinedGraphIndex([]) |
| 2748 | 1415 | cgi2 = CombinedGraphIndex([]) | 1422 | cgi2 = index.CombinedGraphIndex([]) |
| 2749 | 1416 | cgi1.insert_index(0, self.make_index_with_simple_nodes('1-1'), 'one') | 1423 | cgi1.insert_index(0, self.make_index_with_simple_nodes('1-1'), 'one') |
| 2750 | 1417 | cgi1.insert_index(1, self.make_index_with_simple_nodes('1-2'), 'two') | 1424 | cgi1.insert_index(1, self.make_index_with_simple_nodes('1-2'), 'two') |
| 2751 | 1418 | cgi2.insert_index(0, self.make_index_with_simple_nodes('2-1'), 'one') | 1425 | cgi2.insert_index(0, self.make_index_with_simple_nodes('2-1'), 'one') |
| 2752 | @@ -1425,23 +1432,23 @@ | |||
| 2753 | 1425 | self.assertEqual(['two', 'one'], cgi2._index_names) | 1432 | self.assertEqual(['two', 'one'], cgi2._index_names) |
| 2754 | 1426 | 1433 | ||
| 2755 | 1427 | def test_validate_reloads(self): | 1434 | def test_validate_reloads(self): |
| 2758 | 1428 | index, reload_counter = self.make_combined_index_with_missing() | 1435 | idx, reload_counter = self.make_combined_index_with_missing() |
| 2759 | 1429 | index.validate() | 1436 | idx.validate() |
| 2760 | 1430 | self.assertEqual([1, 1, 0], reload_counter) | 1437 | self.assertEqual([1, 1, 0], reload_counter) |
| 2761 | 1431 | 1438 | ||
| 2762 | 1432 | def test_validate_reloads_midway(self): | 1439 | def test_validate_reloads_midway(self): |
| 2765 | 1433 | index, reload_counter = self.make_combined_index_with_missing(['2']) | 1440 | idx, reload_counter = self.make_combined_index_with_missing(['2']) |
| 2766 | 1434 | index.validate() | 1441 | idx.validate() |
| 2767 | 1435 | 1442 | ||
| 2768 | 1436 | def test_validate_no_reload(self): | 1443 | def test_validate_no_reload(self): |
| 2772 | 1437 | index, reload_counter = self.make_combined_index_with_missing() | 1444 | idx, reload_counter = self.make_combined_index_with_missing() |
| 2773 | 1438 | index._reload_func = None | 1445 | idx._reload_func = None |
| 2774 | 1439 | self.assertRaises(errors.NoSuchFile, index.validate) | 1446 | self.assertRaises(errors.NoSuchFile, idx.validate) |
| 2775 | 1440 | 1447 | ||
| 2776 | 1441 | def test_validate_reloads_and_fails(self): | 1448 | def test_validate_reloads_and_fails(self): |
| 2780 | 1442 | index, reload_counter = self.make_combined_index_with_missing( | 1449 | idx, reload_counter = self.make_combined_index_with_missing( |
| 2781 | 1443 | ['1', '2', '3']) | 1450 | ['1', '2', '3']) |
| 2782 | 1444 | self.assertRaises(errors.NoSuchFile, index.validate) | 1451 | self.assertRaises(errors.NoSuchFile, idx.validate) |
| 2783 | 1445 | 1452 | ||
| 2784 | 1446 | def test_find_ancestors_across_indexes(self): | 1453 | def test_find_ancestors_across_indexes(self): |
| 2785 | 1447 | key1 = ('key-1',) | 1454 | key1 = ('key-1',) |
| 2786 | @@ -1456,7 +1463,7 @@ | |||
| 2787 | 1456 | (key3, 'value', ([key2],)), | 1463 | (key3, 'value', ([key2],)), |
| 2788 | 1457 | (key4, 'value', ([key3],)), | 1464 | (key4, 'value', ([key3],)), |
| 2789 | 1458 | ]) | 1465 | ]) |
| 2791 | 1459 | c_index = CombinedGraphIndex([index1, index2]) | 1466 | c_index = index.CombinedGraphIndex([index1, index2]) |
| 2792 | 1460 | parent_map, missing_keys = c_index.find_ancestry([key1], 0) | 1467 | parent_map, missing_keys = c_index.find_ancestry([key1], 0) |
| 2793 | 1461 | self.assertEqual({key1: ()}, parent_map) | 1468 | self.assertEqual({key1: ()}, parent_map) |
| 2794 | 1462 | self.assertEqual(set(), missing_keys) | 1469 | self.assertEqual(set(), missing_keys) |
| 2795 | @@ -1479,7 +1486,7 @@ | |||
| 2796 | 1479 | index2 = self.make_index('34', ref_lists=1, nodes=[ | 1486 | index2 = self.make_index('34', ref_lists=1, nodes=[ |
| 2797 | 1480 | (key3, 'value', ([key2],)), | 1487 | (key3, 'value', ([key2],)), |
| 2798 | 1481 | ]) | 1488 | ]) |
| 2800 | 1482 | c_index = CombinedGraphIndex([index1, index2]) | 1489 | c_index = index.CombinedGraphIndex([index1, index2]) |
| 2801 | 1483 | # Searching for a key which is actually not present at all should | 1490 | # Searching for a key which is actually not present at all should |
| 2802 | 1484 | # eventually converge | 1491 | # eventually converge |
| 2803 | 1485 | parent_map, missing_keys = c_index.find_ancestry([key4], 0) | 1492 | parent_map, missing_keys = c_index.find_ancestry([key4], 0) |
| 2804 | @@ -1487,7 +1494,7 @@ | |||
| 2805 | 1487 | self.assertEqual(set([key4]), missing_keys) | 1494 | self.assertEqual(set([key4]), missing_keys) |
| 2806 | 1488 | 1495 | ||
| 2807 | 1489 | def test_find_ancestors_no_indexes(self): | 1496 | def test_find_ancestors_no_indexes(self): |
| 2809 | 1490 | c_index = CombinedGraphIndex([]) | 1497 | c_index = index.CombinedGraphIndex([]) |
| 2810 | 1491 | key1 = ('key-1',) | 1498 | key1 = ('key-1',) |
| 2811 | 1492 | parent_map, missing_keys = c_index.find_ancestry([key1], 0) | 1499 | parent_map, missing_keys = c_index.find_ancestry([key1], 0) |
| 2812 | 1493 | self.assertEqual({}, parent_map) | 1500 | self.assertEqual({}, parent_map) |
| 2813 | @@ -1505,7 +1512,7 @@ | |||
| 2814 | 1505 | index2 = self.make_index('34', ref_lists=1, nodes=[ | 1512 | index2 = self.make_index('34', ref_lists=1, nodes=[ |
| 2815 | 1506 | (key4, 'value', ([key2, key3],)), | 1513 | (key4, 'value', ([key2, key3],)), |
| 2816 | 1507 | ]) | 1514 | ]) |
| 2818 | 1508 | c_index = CombinedGraphIndex([index1, index2]) | 1515 | c_index = index.CombinedGraphIndex([index1, index2]) |
| 2819 | 1509 | # Searching for a key which is actually not present at all should | 1516 | # Searching for a key which is actually not present at all should |
| 2820 | 1510 | # eventually converge | 1517 | # eventually converge |
| 2821 | 1511 | parent_map, missing_keys = c_index.find_ancestry([key4], 0) | 1518 | parent_map, missing_keys = c_index.find_ancestry([key4], 0) |
| 2822 | @@ -1514,20 +1521,20 @@ | |||
| 2823 | 1514 | self.assertEqual(set([key3]), missing_keys) | 1521 | self.assertEqual(set([key3]), missing_keys) |
| 2824 | 1515 | 1522 | ||
| 2825 | 1516 | def test__find_ancestors_empty_index(self): | 1523 | def test__find_ancestors_empty_index(self): |
| 2827 | 1517 | index = self.make_index('test', ref_lists=1, key_elements=1, nodes=[]) | 1524 | idx = self.make_index('test', ref_lists=1, key_elements=1, nodes=[]) |
| 2828 | 1518 | parent_map = {} | 1525 | parent_map = {} |
| 2829 | 1519 | missing_keys = set() | 1526 | missing_keys = set() |
| 2832 | 1520 | search_keys = index._find_ancestors([('one',), ('two',)], 0, parent_map, | 1527 | search_keys = idx._find_ancestors([('one',), ('two',)], 0, parent_map, |
| 2833 | 1521 | missing_keys) | 1528 | missing_keys) |
| 2834 | 1522 | self.assertEqual(set(), search_keys) | 1529 | self.assertEqual(set(), search_keys) |
| 2835 | 1523 | self.assertEqual({}, parent_map) | 1530 | self.assertEqual({}, parent_map) |
| 2836 | 1524 | self.assertEqual(set([('one',), ('two',)]), missing_keys) | 1531 | self.assertEqual(set([('one',), ('two',)]), missing_keys) |
| 2837 | 1525 | 1532 | ||
| 2838 | 1526 | 1533 | ||
| 2840 | 1527 | class TestInMemoryGraphIndex(TestCaseWithMemoryTransport): | 1534 | class TestInMemoryGraphIndex(tests.TestCaseWithMemoryTransport): |
| 2841 | 1528 | 1535 | ||
| 2842 | 1529 | def make_index(self, ref_lists=0, key_elements=1, nodes=[]): | 1536 | def make_index(self, ref_lists=0, key_elements=1, nodes=[]): |
| 2844 | 1530 | result = InMemoryGraphIndex(ref_lists, key_elements=key_elements) | 1537 | result = index.InMemoryGraphIndex(ref_lists, key_elements=key_elements) |
| 2845 | 1531 | result.add_nodes(nodes) | 1538 | result.add_nodes(nodes) |
| 2846 | 1532 | return result | 1539 | return result |
| 2847 | 1533 | 1540 | ||
| 2848 | @@ -1654,23 +1661,26 @@ | |||
| 2849 | 1654 | index.validate() | 1661 | index.validate() |
| 2850 | 1655 | 1662 | ||
| 2851 | 1656 | 1663 | ||
| 2853 | 1657 | class TestGraphIndexPrefixAdapter(TestCaseWithMemoryTransport): | 1664 | class TestGraphIndexPrefixAdapter(tests.TestCaseWithMemoryTransport): |
| 2854 | 1658 | 1665 | ||
| 2857 | 1659 | def make_index(self, ref_lists=1, key_elements=2, nodes=[], add_callback=False): | 1666 | def make_index(self, ref_lists=1, key_elements=2, nodes=[], |
| 2858 | 1660 | result = InMemoryGraphIndex(ref_lists, key_elements=key_elements) | 1667 | add_callback=False): |
| 2859 | 1668 | result = index.InMemoryGraphIndex(ref_lists, key_elements=key_elements) | ||
| 2860 | 1661 | result.add_nodes(nodes) | 1669 | result.add_nodes(nodes) |
| 2861 | 1662 | if add_callback: | 1670 | if add_callback: |
| 2862 | 1663 | add_nodes_callback = result.add_nodes | 1671 | add_nodes_callback = result.add_nodes |
| 2863 | 1664 | else: | 1672 | else: |
| 2864 | 1665 | add_nodes_callback = None | 1673 | add_nodes_callback = None |
| 2866 | 1666 | adapter = GraphIndexPrefixAdapter(result, ('prefix', ), key_elements - 1, | 1674 | adapter = index.GraphIndexPrefixAdapter( |
| 2867 | 1675 | result, ('prefix', ), key_elements - 1, | ||
| 2868 | 1667 | add_nodes_callback=add_nodes_callback) | 1676 | add_nodes_callback=add_nodes_callback) |
| 2869 | 1668 | return result, adapter | 1677 | return result, adapter |
| 2870 | 1669 | 1678 | ||
| 2871 | 1670 | def test_add_node(self): | 1679 | def test_add_node(self): |
| 2872 | 1671 | index, adapter = self.make_index(add_callback=True) | 1680 | index, adapter = self.make_index(add_callback=True) |
| 2873 | 1672 | adapter.add_node(('key',), 'value', ((('ref',),),)) | 1681 | adapter.add_node(('key',), 'value', ((('ref',),),)) |
| 2875 | 1673 | self.assertEqual(set([(index, ('prefix', 'key'), 'value', ((('prefix', 'ref'),),))]), | 1682 | self.assertEqual(set([(index, ('prefix', 'key'), 'value', |
| 2876 | 1683 | ((('prefix', 'ref'),),))]), | ||
| 2877 | 1674 | set(index.iter_all_entries())) | 1684 | set(index.iter_all_entries())) |
| 2878 | 1675 | 1685 | ||
| 2879 | 1676 | def test_add_nodes(self): | 1686 | def test_add_nodes(self): |
| 2880 | @@ -1686,12 +1696,13 @@ | |||
| 2881 | 1686 | set(index.iter_all_entries())) | 1696 | set(index.iter_all_entries())) |
| 2882 | 1687 | 1697 | ||
| 2883 | 1688 | def test_construct(self): | 1698 | def test_construct(self): |
| 2886 | 1689 | index = InMemoryGraphIndex() | 1699 | idx = index.InMemoryGraphIndex() |
| 2887 | 1690 | adapter = GraphIndexPrefixAdapter(index, ('prefix', ), 1) | 1700 | adapter = index.GraphIndexPrefixAdapter(idx, ('prefix', ), 1) |
| 2888 | 1691 | 1701 | ||
| 2889 | 1692 | def test_construct_with_callback(self): | 1702 | def test_construct_with_callback(self): |
| 2892 | 1693 | index = InMemoryGraphIndex() | 1703 | idx = index.InMemoryGraphIndex() |
| 2893 | 1694 | adapter = GraphIndexPrefixAdapter(index, ('prefix', ), 1, index.add_nodes) | 1704 | adapter = index.GraphIndexPrefixAdapter(idx, ('prefix', ), 1, |
| 2894 | 1705 | idx.add_nodes) | ||
| 2895 | 1695 | 1706 | ||
| 2896 | 1696 | def test_iter_all_entries_cross_prefix_map_errors(self): | 1707 | def test_iter_all_entries_cross_prefix_map_errors(self): |
| 2897 | 1697 | index, adapter = self.make_index(nodes=[ | 1708 | index, adapter = self.make_index(nodes=[ |
| 2898 | 1698 | 1709 | ||
| 2899 | === modified file 'bzrlib/tests/test_knit.py' | |||
| 2900 | --- bzrlib/tests/test_knit.py 2010-06-04 03:09:35 +0000 | |||
| 2901 | +++ bzrlib/tests/test_knit.py 2010-06-29 17:48:31 +0000 | |||
| 2902 | @@ -26,6 +26,7 @@ | |||
| 2903 | 26 | osutils, | 26 | osutils, |
| 2904 | 27 | pack, | 27 | pack, |
| 2905 | 28 | tests, | 28 | tests, |
| 2906 | 29 | transport, | ||
| 2907 | 29 | tuned_gzip, | 30 | tuned_gzip, |
| 2908 | 30 | ) | 31 | ) |
| 2909 | 31 | from bzrlib.errors import ( | 32 | from bzrlib.errors import ( |
| 2910 | @@ -53,7 +54,6 @@ | |||
| 2911 | 53 | TestCaseWithTransport, | 54 | TestCaseWithTransport, |
| 2912 | 54 | TestNotApplicable, | 55 | TestNotApplicable, |
| 2913 | 55 | ) | 56 | ) |
| 2914 | 56 | from bzrlib.transport import get_transport | ||
| 2915 | 57 | from bzrlib.versionedfile import ( | 57 | from bzrlib.versionedfile import ( |
| 2916 | 58 | AbsentContentFactory, | 58 | AbsentContentFactory, |
| 2917 | 59 | ConstantMapper, | 59 | ConstantMapper, |
| 2918 | @@ -1571,13 +1571,13 @@ | |||
| 2919 | 1571 | # could leave an empty .kndx file, which bzr would later claim was a | 1571 | # could leave an empty .kndx file, which bzr would later claim was a |
| 2920 | 1572 | # corrupted file since the header was not present. In reality, the file | 1572 | # corrupted file since the header was not present. In reality, the file |
| 2921 | 1573 | # just wasn't created, so it should be ignored. | 1573 | # just wasn't created, so it should be ignored. |
| 2923 | 1574 | t = get_transport('.') | 1574 | t = transport.get_transport('.') |
| 2924 | 1575 | t.put_bytes('test.kndx', '') | 1575 | t.put_bytes('test.kndx', '') |
| 2925 | 1576 | 1576 | ||
| 2926 | 1577 | knit = self.make_test_knit() | 1577 | knit = self.make_test_knit() |
| 2927 | 1578 | 1578 | ||
| 2928 | 1579 | def test_knit_index_checks_header(self): | 1579 | def test_knit_index_checks_header(self): |
| 2930 | 1580 | t = get_transport('.') | 1580 | t = transport.get_transport('.') |
| 2931 | 1581 | t.put_bytes('test.kndx', '# not really a knit header\n\n') | 1581 | t.put_bytes('test.kndx', '# not really a knit header\n\n') |
| 2932 | 1582 | k = self.make_test_knit() | 1582 | k = self.make_test_knit() |
| 2933 | 1583 | self.assertRaises(KnitHeaderError, k.keys) | 1583 | self.assertRaises(KnitHeaderError, k.keys) |
| 2934 | 1584 | 1584 | ||
| 2935 | === modified file 'bzrlib/tests/test_lockable_files.py' | |||
| 2936 | --- bzrlib/tests/test_lockable_files.py 2010-02-17 17:11:16 +0000 | |||
| 2937 | +++ bzrlib/tests/test_lockable_files.py 2010-06-29 17:48:31 +0000 | |||
| 2938 | @@ -21,6 +21,7 @@ | |||
| 2939 | 21 | errors, | 21 | errors, |
| 2940 | 22 | lockdir, | 22 | lockdir, |
| 2941 | 23 | osutils, | 23 | osutils, |
| 2942 | 24 | transport, | ||
| 2943 | 24 | ) | 25 | ) |
| 2944 | 25 | from bzrlib.errors import BzrBadParameterNotString, NoSuchFile, ReadOnlyError | 26 | from bzrlib.errors import BzrBadParameterNotString, NoSuchFile, ReadOnlyError |
| 2945 | 26 | from bzrlib.lockable_files import LockableFiles, TransportLock | 27 | from bzrlib.lockable_files import LockableFiles, TransportLock |
| 2946 | @@ -37,7 +38,6 @@ | |||
| 2947 | 37 | ReadOnlyTransaction, | 38 | ReadOnlyTransaction, |
| 2948 | 38 | WriteTransaction, | 39 | WriteTransaction, |
| 2949 | 39 | ) | 40 | ) |
| 2950 | 40 | from bzrlib.transport import get_transport | ||
| 2951 | 41 | 41 | ||
| 2952 | 42 | 42 | ||
| 2953 | 43 | # these tests are applied in each parameterized suite for LockableFiles | 43 | # these tests are applied in each parameterized suite for LockableFiles |
| 2954 | @@ -279,9 +279,9 @@ | |||
| 2955 | 279 | 279 | ||
| 2956 | 280 | def setUp(self): | 280 | def setUp(self): |
| 2957 | 281 | TestCaseInTempDir.setUp(self) | 281 | TestCaseInTempDir.setUp(self) |
| 2961 | 282 | transport = get_transport('.') | 282 | t = transport.get_transport('.') |
| 2962 | 283 | transport.mkdir('.bzr') | 283 | t.mkdir('.bzr') |
| 2963 | 284 | self.sub_transport = transport.clone('.bzr') | 284 | self.sub_transport = t.clone('.bzr') |
| 2964 | 285 | self.lockable = self.get_lockable() | 285 | self.lockable = self.get_lockable() |
| 2965 | 286 | self.lockable.create_lock() | 286 | self.lockable.create_lock() |
| 2966 | 287 | 287 | ||
| 2967 | @@ -304,7 +304,7 @@ | |||
| 2968 | 304 | 304 | ||
| 2969 | 305 | def setUp(self): | 305 | def setUp(self): |
| 2970 | 306 | TestCaseInTempDir.setUp(self) | 306 | TestCaseInTempDir.setUp(self) |
| 2972 | 307 | self.transport = get_transport('.') | 307 | self.transport = transport.get_transport('.') |
| 2973 | 308 | self.lockable = self.get_lockable() | 308 | self.lockable = self.get_lockable() |
| 2974 | 309 | # the lock creation here sets mode - test_permissions on branch | 309 | # the lock creation here sets mode - test_permissions on branch |
| 2975 | 310 | # tests that implicitly, but it might be a good idea to factor | 310 | # tests that implicitly, but it might be a good idea to factor |
| 2976 | @@ -347,7 +347,7 @@ | |||
| 2977 | 347 | # in test_remote and test_smart as usual. | 347 | # in test_remote and test_smart as usual. |
| 2978 | 348 | b = self.make_branch('foo') | 348 | b = self.make_branch('foo') |
| 2979 | 349 | self.addCleanup(b.bzrdir.transport.disconnect) | 349 | self.addCleanup(b.bzrdir.transport.disconnect) |
| 2981 | 350 | self.transport = get_transport('.') | 350 | self.transport = transport.get_transport('.') |
| 2982 | 351 | self.lockable = self.get_lockable() | 351 | self.lockable = self.get_lockable() |
| 2983 | 352 | 352 | ||
| 2984 | 353 | def get_lockable(self): | 353 | def get_lockable(self): |
| 2985 | 354 | 354 | ||
| 2986 | === modified file 'bzrlib/tests/test_osutils.py' | |||
| 2987 | --- bzrlib/tests/test_osutils.py 2010-06-08 01:45:09 +0000 | |||
| 2988 | +++ bzrlib/tests/test_osutils.py 2010-06-29 17:48:31 +0000 | |||
| 2989 | @@ -861,7 +861,7 @@ | |||
| 2990 | 861 | self.assertEqual('//HOST/path', osutils._win98_abspath('//HOST/path')) | 861 | self.assertEqual('//HOST/path', osutils._win98_abspath('//HOST/path')) |
| 2991 | 862 | # relative path | 862 | # relative path |
| 2992 | 863 | cwd = osutils.getcwd().rstrip('/') | 863 | cwd = osutils.getcwd().rstrip('/') |
| 2994 | 864 | drive = osutils._nt_splitdrive(cwd)[0] | 864 | drive = osutils.ntpath.splitdrive(cwd)[0] |
| 2995 | 865 | self.assertEqual(cwd+'/path', osutils._win98_abspath('path')) | 865 | self.assertEqual(cwd+'/path', osutils._win98_abspath('path')) |
| 2996 | 866 | self.assertEqual(drive+'/path', osutils._win98_abspath('/path')) | 866 | self.assertEqual(drive+'/path', osutils._win98_abspath('/path')) |
| 2997 | 867 | # unicode path | 867 | # unicode path |
| 2998 | 868 | 868 | ||
| 2999 | === modified file 'bzrlib/tests/test_osutils_encodings.py' | |||
| 3000 | --- bzrlib/tests/test_osutils_encodings.py 2010-06-25 20:34:05 +0000 | |||
| 3001 | +++ bzrlib/tests/test_osutils_encodings.py 2010-06-29 17:48:31 +0000 | |||
| 3002 | @@ -1,4 +1,4 @@ | |||
| 3004 | 1 | # Copyright (C) 2005, 2006 Canonical Ltd | 1 | # Copyright (C) 2006-2010 Canonical Ltd |
| 3005 | 2 | # | 2 | # |
| 3006 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 3007 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 3008 | 5 | 5 | ||
| 3009 | === modified file 'bzrlib/tests/test_permissions.py' | |||
| 3010 | --- bzrlib/tests/test_permissions.py 2009-09-07 08:46:00 +0000 | |||
| 3011 | +++ bzrlib/tests/test_permissions.py 2010-06-29 17:48:31 +0000 | |||
| 3012 | @@ -1,4 +1,4 @@ | |||
| 3014 | 1 | # Copyright (C) 2005 Canonical Ltd | 1 | # Copyright (C) 2005-2010 Canonical Ltd |
| 3015 | 2 | # -*- coding: utf-8 -*- | 2 | # -*- coding: utf-8 -*- |
| 3016 | 3 | # | 3 | # |
| 3017 | 4 | # This program is free software; you can redistribute it and/or modify | 4 | # This program is free software; you can redistribute it and/or modify |
| 3018 | @@ -36,11 +36,11 @@ | |||
| 3019 | 36 | from cStringIO import StringIO | 36 | from cStringIO import StringIO |
| 3020 | 37 | import urllib | 37 | import urllib |
| 3021 | 38 | 38 | ||
| 3022 | 39 | from bzrlib import transport | ||
| 3023 | 39 | from bzrlib.branch import Branch | 40 | from bzrlib.branch import Branch |
| 3024 | 40 | from bzrlib.bzrdir import BzrDir | 41 | from bzrlib.bzrdir import BzrDir |
| 3025 | 41 | from bzrlib.tests import TestCaseWithTransport, TestSkipped | 42 | from bzrlib.tests import TestCaseWithTransport, TestSkipped |
| 3026 | 42 | from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer | 43 | from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer |
| 3027 | 43 | from bzrlib.transport import get_transport | ||
| 3028 | 44 | from bzrlib.workingtree import WorkingTree | 44 | from bzrlib.workingtree import WorkingTree |
| 3029 | 45 | 45 | ||
| 3030 | 46 | 46 | ||
| 3031 | @@ -65,7 +65,7 @@ | |||
| 3032 | 65 | :param dir_mode: The mode for all directories | 65 | :param dir_mode: The mode for all directories |
| 3033 | 66 | :param include_base: If false, only check the subdirectories | 66 | :param include_base: If false, only check the subdirectories |
| 3034 | 67 | """ | 67 | """ |
| 3036 | 68 | t = get_transport(".") | 68 | t = transport.get_transport(".") |
| 3037 | 69 | if include_base: | 69 | if include_base: |
| 3038 | 70 | test.assertTransportMode(t, base, dir_mode) | 70 | test.assertTransportMode(t, base, dir_mode) |
| 3039 | 71 | for root, dirs, files in os.walk(base): | 71 | for root, dirs, files in os.walk(base): |
| 3040 | @@ -180,7 +180,7 @@ | |||
| 3041 | 180 | 180 | ||
| 3042 | 181 | # bodge around for stubsftpserver not letting use connect | 181 | # bodge around for stubsftpserver not letting use connect |
| 3043 | 182 | # more than once | 182 | # more than once |
| 3045 | 183 | _t = get_transport(self.get_url()) | 183 | _t = transport.get_transport(self.get_url()) |
| 3046 | 184 | 184 | ||
| 3047 | 185 | os.mkdir('local') | 185 | os.mkdir('local') |
| 3048 | 186 | t_local = self.make_branch_and_tree('local') | 186 | t_local = self.make_branch_and_tree('local') |
| 3049 | @@ -257,7 +257,7 @@ | |||
| 3050 | 257 | original_umask = os.umask(umask) | 257 | original_umask = os.umask(umask) |
| 3051 | 258 | 258 | ||
| 3052 | 259 | try: | 259 | try: |
| 3054 | 260 | t = get_transport(self.get_url()) | 260 | t = transport.get_transport(self.get_url()) |
| 3055 | 261 | # Direct access should be masked by umask | 261 | # Direct access should be masked by umask |
| 3056 | 262 | t._sftp_open_exclusive('a', mode=0666).write('foo\n') | 262 | t._sftp_open_exclusive('a', mode=0666).write('foo\n') |
| 3057 | 263 | self.assertTransportMode(t, 'a', 0666 &~umask) | 263 | self.assertTransportMode(t, 'a', 0666 &~umask) |
| 3058 | 264 | 264 | ||
| 3059 | === modified file 'bzrlib/tests/test_reconcile.py' | |||
| 3060 | --- bzrlib/tests/test_reconcile.py 2009-03-23 14:59:43 +0000 | |||
| 3061 | +++ bzrlib/tests/test_reconcile.py 2010-06-29 17:48:31 +0000 | |||
| 3062 | @@ -1,4 +1,4 @@ | |||
| 3064 | 1 | # Copyright (C) 2006 Canonical Ltd | 1 | # Copyright (C) 2006, 2008, 2009, 2010 Canonical Ltd |
| 3065 | 2 | # | 2 | # |
| 3066 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 3067 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 3068 | @@ -17,15 +17,18 @@ | |||
| 3069 | 17 | """Tests for reconiliation behaviour that is repository independent.""" | 17 | """Tests for reconiliation behaviour that is repository independent.""" |
| 3070 | 18 | 18 | ||
| 3071 | 19 | 19 | ||
| 3073 | 20 | from bzrlib import bzrdir, errors, tests | 20 | from bzrlib import ( |
| 3074 | 21 | bzrdir, | ||
| 3075 | 22 | errors, | ||
| 3076 | 23 | tests, | ||
| 3077 | 24 | ) | ||
| 3078 | 21 | from bzrlib.reconcile import reconcile, Reconciler | 25 | from bzrlib.reconcile import reconcile, Reconciler |
| 3079 | 22 | from bzrlib.revision import Revision | 26 | from bzrlib.revision import Revision |
| 3082 | 23 | from bzrlib.tests.per_repository import TestCaseWithRepository | 27 | from bzrlib.tests import per_repository |
| 3081 | 24 | from bzrlib.transport import get_transport | ||
| 3083 | 25 | from bzrlib.workingtree import WorkingTree | 28 | from bzrlib.workingtree import WorkingTree |
| 3084 | 26 | 29 | ||
| 3085 | 27 | 30 | ||
| 3087 | 28 | class TestWorksWithSharedRepositories(TestCaseWithRepository): | 31 | class TestWorksWithSharedRepositories(per_repository.TestCaseWithRepository): |
| 3088 | 29 | 32 | ||
| 3089 | 30 | def test_reweave_empty(self): | 33 | def test_reweave_empty(self): |
| 3090 | 31 | # we want a repo capable format | 34 | # we want a repo capable format |
| 3091 | 32 | 35 | ||
| 3092 | === modified file 'bzrlib/tests/test_remote.py' | |||
| 3093 | --- bzrlib/tests/test_remote.py 2010-05-20 18:23:17 +0000 | |||
| 3094 | +++ bzrlib/tests/test_remote.py 2010-06-29 17:48:31 +0000 | |||
| 3095 | @@ -38,6 +38,7 @@ | |||
| 3096 | 38 | remote, | 38 | remote, |
| 3097 | 39 | repository, | 39 | repository, |
| 3098 | 40 | tests, | 40 | tests, |
| 3099 | 41 | transport, | ||
| 3100 | 41 | treebuilder, | 42 | treebuilder, |
| 3101 | 42 | urlutils, | 43 | urlutils, |
| 3102 | 43 | versionedfile, | 44 | versionedfile, |
| 3103 | @@ -63,7 +64,6 @@ | |||
| 3104 | 63 | multiply_tests, | 64 | multiply_tests, |
| 3105 | 64 | test_server, | 65 | test_server, |
| 3106 | 65 | ) | 66 | ) |
| 3107 | 66 | from bzrlib.transport import get_transport | ||
| 3108 | 67 | from bzrlib.transport.memory import MemoryTransport | 67 | from bzrlib.transport.memory import MemoryTransport |
| 3109 | 68 | from bzrlib.transport.remote import ( | 68 | from bzrlib.transport.remote import ( |
| 3110 | 69 | RemoteTransport, | 69 | RemoteTransport, |
| 3111 | @@ -359,8 +359,8 @@ | |||
| 3112 | 359 | a given client_base and transport_base. | 359 | a given client_base and transport_base. |
| 3113 | 360 | """ | 360 | """ |
| 3114 | 361 | client_medium = medium.SmartClientMedium(client_base) | 361 | client_medium = medium.SmartClientMedium(client_base) |
| 3117 | 362 | transport = get_transport(transport_base) | 362 | t = transport.get_transport(transport_base) |
| 3118 | 363 | result = client_medium.remote_path_from_transport(transport) | 363 | result = client_medium.remote_path_from_transport(t) |
| 3119 | 364 | self.assertEqual(expected, result) | 364 | self.assertEqual(expected, result) |
| 3120 | 365 | 365 | ||
| 3121 | 366 | def test_remote_path_from_transport(self): | 366 | def test_remote_path_from_transport(self): |
| 3122 | @@ -377,7 +377,7 @@ | |||
| 3123 | 377 | a given transport_base and relpath of that transport. (Note that | 377 | a given transport_base and relpath of that transport. (Note that |
| 3124 | 378 | HttpTransportBase is a subclass of SmartClientMedium) | 378 | HttpTransportBase is a subclass of SmartClientMedium) |
| 3125 | 379 | """ | 379 | """ |
| 3127 | 380 | base_transport = get_transport(transport_base) | 380 | base_transport = transport.get_transport(transport_base) |
| 3128 | 381 | client_medium = base_transport.get_smart_medium() | 381 | client_medium = base_transport.get_smart_medium() |
| 3129 | 382 | cloned_transport = base_transport.clone(relpath) | 382 | cloned_transport = base_transport.clone(relpath) |
| 3130 | 383 | result = client_medium.remote_path_from_transport(cloned_transport) | 383 | result = client_medium.remote_path_from_transport(cloned_transport) |
| 3131 | 384 | 384 | ||
| 3132 | === modified file 'bzrlib/tests/test_selftest.py' | |||
| 3133 | --- bzrlib/tests/test_selftest.py 2010-05-14 09:48:51 +0000 | |||
| 3134 | +++ bzrlib/tests/test_selftest.py 2010-06-29 17:48:31 +0000 | |||
| 3135 | @@ -622,7 +622,6 @@ | |||
| 3136 | 622 | """Tests for the convenience functions TestCaseWithTransport introduces.""" | 622 | """Tests for the convenience functions TestCaseWithTransport introduces.""" |
| 3137 | 623 | 623 | ||
| 3138 | 624 | def test_get_readonly_url_none(self): | 624 | def test_get_readonly_url_none(self): |
| 3139 | 625 | from bzrlib.transport import get_transport | ||
| 3140 | 626 | from bzrlib.transport.readonly import ReadonlyTransportDecorator | 625 | from bzrlib.transport.readonly import ReadonlyTransportDecorator |
| 3141 | 627 | self.vfs_transport_factory = memory.MemoryServer | 626 | self.vfs_transport_factory = memory.MemoryServer |
| 3142 | 628 | self.transport_readonly_server = None | 627 | self.transport_readonly_server = None |
| 3143 | @@ -630,15 +629,14 @@ | |||
| 3144 | 630 | # for the server | 629 | # for the server |
| 3145 | 631 | url = self.get_readonly_url() | 630 | url = self.get_readonly_url() |
| 3146 | 632 | url2 = self.get_readonly_url('foo/bar') | 631 | url2 = self.get_readonly_url('foo/bar') |
| 3149 | 633 | t = get_transport(url) | 632 | t = transport.get_transport(url) |
| 3150 | 634 | t2 = get_transport(url2) | 633 | t2 = transport.get_transport(url2) |
| 3151 | 635 | self.failUnless(isinstance(t, ReadonlyTransportDecorator)) | 634 | self.failUnless(isinstance(t, ReadonlyTransportDecorator)) |
| 3152 | 636 | self.failUnless(isinstance(t2, ReadonlyTransportDecorator)) | 635 | self.failUnless(isinstance(t2, ReadonlyTransportDecorator)) |
| 3153 | 637 | self.assertEqual(t2.base[:-1], t.abspath('foo/bar')) | 636 | self.assertEqual(t2.base[:-1], t.abspath('foo/bar')) |
| 3154 | 638 | 637 | ||
| 3155 | 639 | def test_get_readonly_url_http(self): | 638 | def test_get_readonly_url_http(self): |
| 3156 | 640 | from bzrlib.tests.http_server import HttpServer | 639 | from bzrlib.tests.http_server import HttpServer |
| 3157 | 641 | from bzrlib.transport import get_transport | ||
| 3158 | 642 | from bzrlib.transport.http import HttpTransportBase | 640 | from bzrlib.transport.http import HttpTransportBase |
| 3159 | 643 | self.transport_server = test_server.LocalURLServer | 641 | self.transport_server = test_server.LocalURLServer |
| 3160 | 644 | self.transport_readonly_server = HttpServer | 642 | self.transport_readonly_server = HttpServer |
| 3161 | @@ -646,8 +644,8 @@ | |||
| 3162 | 646 | url = self.get_readonly_url() | 644 | url = self.get_readonly_url() |
| 3163 | 647 | url2 = self.get_readonly_url('foo/bar') | 645 | url2 = self.get_readonly_url('foo/bar') |
| 3164 | 648 | # the transport returned may be any HttpTransportBase subclass | 646 | # the transport returned may be any HttpTransportBase subclass |
| 3167 | 649 | t = get_transport(url) | 647 | t = transport.get_transport(url) |
| 3168 | 650 | t2 = get_transport(url2) | 648 | t2 = transport.get_transport(url2) |
| 3169 | 651 | self.failUnless(isinstance(t, HttpTransportBase)) | 649 | self.failUnless(isinstance(t, HttpTransportBase)) |
| 3170 | 652 | self.failUnless(isinstance(t2, HttpTransportBase)) | 650 | self.failUnless(isinstance(t2, HttpTransportBase)) |
| 3171 | 653 | self.assertEqual(t2.base[:-1], t.abspath('foo/bar')) | 651 | self.assertEqual(t2.base[:-1], t.abspath('foo/bar')) |
| 3172 | @@ -691,8 +689,7 @@ | |||
| 3173 | 691 | class TestChrootedTest(tests.ChrootedTestCase): | 689 | class TestChrootedTest(tests.ChrootedTestCase): |
| 3174 | 692 | 690 | ||
| 3175 | 693 | def test_root_is_root(self): | 691 | def test_root_is_root(self): |
| 3178 | 694 | from bzrlib.transport import get_transport | 692 | t = transport.get_transport(self.get_readonly_url()) |
| 3177 | 695 | t = get_transport(self.get_readonly_url()) | ||
| 3179 | 696 | url = t.base | 693 | url = t.base |
| 3180 | 697 | self.assertEqual(url, t.clone('..').base) | 694 | self.assertEqual(url, t.clone('..').base) |
| 3181 | 698 | 695 | ||
| 3182 | 699 | 696 | ||
| 3183 | === modified file 'bzrlib/tests/test_sftp_transport.py' | |||
| 3184 | --- bzrlib/tests/test_sftp_transport.py 2010-02-23 07:43:11 +0000 | |||
| 3185 | +++ bzrlib/tests/test_sftp_transport.py 2010-06-29 17:48:31 +0000 | |||
| 3186 | @@ -41,7 +41,6 @@ | |||
| 3187 | 41 | TestSkipped, | 41 | TestSkipped, |
| 3188 | 42 | ) | 42 | ) |
| 3189 | 43 | from bzrlib.tests.http_server import HttpServer | 43 | from bzrlib.tests.http_server import HttpServer |
| 3190 | 44 | from bzrlib.transport import get_transport | ||
| 3191 | 45 | import bzrlib.transport.http | 44 | import bzrlib.transport.http |
| 3192 | 46 | 45 | ||
| 3193 | 47 | if features.paramiko.available(): | 46 | if features.paramiko.available(): |
| 3194 | @@ -190,7 +189,7 @@ | |||
| 3195 | 190 | server = stub_sftp.SFTPSiblingAbsoluteServer() | 189 | server = stub_sftp.SFTPSiblingAbsoluteServer() |
| 3196 | 191 | server.start_server() | 190 | server.start_server() |
| 3197 | 192 | try: | 191 | try: |
| 3199 | 193 | transport = get_transport(server.get_url()) | 192 | transport = _mod_transport.get_transport(server.get_url()) |
| 3200 | 194 | self.assertFalse(transport.abspath('/').endswith('/~/')) | 193 | self.assertFalse(transport.abspath('/').endswith('/~/')) |
| 3201 | 195 | self.assertTrue(transport.abspath('/').endswith('/')) | 194 | self.assertTrue(transport.abspath('/').endswith('/')) |
| 3202 | 196 | del transport | 195 | del transport |
| 3203 | @@ -313,7 +312,7 @@ | |||
| 3204 | 313 | """Test that a real connection attempt raises the right error""" | 312 | """Test that a real connection attempt raises the right error""" |
| 3205 | 314 | from bzrlib.transport import ssh | 313 | from bzrlib.transport import ssh |
| 3206 | 315 | self.set_vendor(ssh.ParamikoVendor()) | 314 | self.set_vendor(ssh.ParamikoVendor()) |
| 3208 | 316 | t = bzrlib.transport.get_transport(self.bogus_url) | 315 | t = _mod_transport.get_transport(self.bogus_url) |
| 3209 | 317 | self.assertRaises(errors.ConnectionError, t.get, 'foobar') | 316 | self.assertRaises(errors.ConnectionError, t.get, 'foobar') |
| 3210 | 318 | 317 | ||
| 3211 | 319 | def test_bad_connection_ssh(self): | 318 | def test_bad_connection_ssh(self): |
| 3212 | @@ -324,7 +323,7 @@ | |||
| 3213 | 324 | # However, 'ssh' will create stipple on the output, so instead | 323 | # However, 'ssh' will create stipple on the output, so instead |
| 3214 | 325 | # I'm using run_bzr_subprocess, and parsing the output | 324 | # I'm using run_bzr_subprocess, and parsing the output |
| 3215 | 326 | # try: | 325 | # try: |
| 3217 | 327 | # t = bzrlib.transport.get_transport(self.bogus_url) | 326 | # t = _mod_transport.get_transport(self.bogus_url) |
| 3218 | 328 | # except errors.ConnectionError: | 327 | # except errors.ConnectionError: |
| 3219 | 329 | # # Correct error | 328 | # # Correct error |
| 3220 | 330 | # pass | 329 | # pass |
| 3221 | @@ -511,7 +510,7 @@ | |||
| 3222 | 511 | conf._get_config().update( | 510 | conf._get_config().update( |
| 3223 | 512 | {'sftptest': {'scheme': 'ssh', 'port': port, 'user': 'bar'}}) | 511 | {'sftptest': {'scheme': 'ssh', 'port': port, 'user': 'bar'}}) |
| 3224 | 513 | conf._save() | 512 | conf._save() |
| 3226 | 514 | t = get_transport('sftp://localhost:%d' % port) | 513 | t = _mod_transport.get_transport('sftp://localhost:%d' % port) |
| 3227 | 515 | # force a connection to be performed. | 514 | # force a connection to be performed. |
| 3228 | 516 | t.has('foo') | 515 | t.has('foo') |
| 3229 | 517 | return t | 516 | return t |
| 3230 | 518 | 517 | ||
| 3231 | === modified file 'bzrlib/tests/test_smart_request.py' | |||
| 3232 | --- bzrlib/tests/test_smart_request.py 2009-07-27 02:11:25 +0000 | |||
| 3233 | +++ bzrlib/tests/test_smart_request.py 2010-06-29 17:48:31 +0000 | |||
| 3234 | @@ -1,4 +1,4 @@ | |||
| 3236 | 1 | # Copyright (C) 2009 Canonical Ltd | 1 | # Copyright (C) 2009, 2010 Canonical Ltd |
| 3237 | 2 | # | 2 | # |
| 3238 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 3239 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 3240 | @@ -18,11 +18,13 @@ | |||
| 3241 | 18 | 18 | ||
| 3242 | 19 | import threading | 19 | import threading |
| 3243 | 20 | 20 | ||
| 3245 | 21 | from bzrlib import errors | 21 | from bzrlib import ( |
| 3246 | 22 | errors, | ||
| 3247 | 23 | transport, | ||
| 3248 | 24 | ) | ||
| 3249 | 22 | from bzrlib.bzrdir import BzrDir | 25 | from bzrlib.bzrdir import BzrDir |
| 3250 | 23 | from bzrlib.smart import request | 26 | from bzrlib.smart import request |
| 3251 | 24 | from bzrlib.tests import TestCase, TestCaseWithMemoryTransport | 27 | from bzrlib.tests import TestCase, TestCaseWithMemoryTransport |
| 3252 | 25 | from bzrlib.transport import get_transport | ||
| 3253 | 26 | 28 | ||
| 3254 | 27 | 29 | ||
| 3255 | 28 | class NoBodyRequest(request.SmartServerRequest): | 30 | class NoBodyRequest(request.SmartServerRequest): |
| 3256 | @@ -34,7 +36,7 @@ | |||
| 3257 | 34 | 36 | ||
| 3258 | 35 | class DoErrorRequest(request.SmartServerRequest): | 37 | class DoErrorRequest(request.SmartServerRequest): |
| 3259 | 36 | """A request that raises an error from self.do().""" | 38 | """A request that raises an error from self.do().""" |
| 3261 | 37 | 39 | ||
| 3262 | 38 | def do(self): | 40 | def do(self): |
| 3263 | 39 | raise errors.NoSuchFile('xyzzy') | 41 | raise errors.NoSuchFile('xyzzy') |
| 3264 | 40 | 42 | ||
| 3265 | @@ -172,7 +174,7 @@ | |||
| 3266 | 172 | 174 | ||
| 3267 | 173 | 175 | ||
| 3268 | 174 | class TestRequestJail(TestCaseWithMemoryTransport): | 176 | class TestRequestJail(TestCaseWithMemoryTransport): |
| 3270 | 175 | 177 | ||
| 3271 | 176 | def test_jail(self): | 178 | def test_jail(self): |
| 3272 | 177 | transport = self.get_transport('blah') | 179 | transport = self.get_transport('blah') |
| 3273 | 178 | req = request.SmartServerRequest(transport) | 180 | req = request.SmartServerRequest(transport) |
| 3274 | @@ -203,8 +205,8 @@ | |||
| 3275 | 203 | # A parent is not allowed | 205 | # A parent is not allowed |
| 3276 | 204 | self.assertRaises(errors.JailBreak, _pre_open_hook, t.clone('..')) | 206 | self.assertRaises(errors.JailBreak, _pre_open_hook, t.clone('..')) |
| 3277 | 205 | # A completely unrelated transport is not allowed | 207 | # A completely unrelated transport is not allowed |
| 3280 | 206 | self.assertRaises( | 208 | self.assertRaises(errors.JailBreak, _pre_open_hook, |
| 3281 | 207 | errors.JailBreak, _pre_open_hook, get_transport('http://host/')) | 209 | transport.get_transport('http://host/')) |
| 3282 | 208 | 210 | ||
| 3283 | 209 | def test_open_bzrdir_in_non_main_thread(self): | 211 | def test_open_bzrdir_in_non_main_thread(self): |
| 3284 | 210 | """Opening a bzrdir in a non-main thread should work ok. | 212 | """Opening a bzrdir in a non-main thread should work ok. |
| 3285 | 211 | 213 | ||
| 3286 | === modified file 'bzrlib/tests/test_transport_log.py' | |||
| 3287 | --- bzrlib/tests/test_transport_log.py 2010-02-17 17:11:16 +0000 | |||
| 3288 | +++ bzrlib/tests/test_transport_log.py 2010-06-29 17:48:31 +0000 | |||
| 3289 | @@ -20,10 +20,9 @@ | |||
| 3290 | 20 | 20 | ||
| 3291 | 21 | import types | 21 | import types |
| 3292 | 22 | 22 | ||
| 3294 | 23 | 23 | from bzrlib import transport | |
| 3295 | 24 | from bzrlib.tests import TestCaseWithMemoryTransport | 24 | from bzrlib.tests import TestCaseWithMemoryTransport |
| 3296 | 25 | from bzrlib.trace import mutter | 25 | from bzrlib.trace import mutter |
| 3297 | 26 | from bzrlib.transport import get_transport | ||
| 3298 | 27 | from bzrlib.transport.log import TransportLogDecorator | 26 | from bzrlib.transport.log import TransportLogDecorator |
| 3299 | 28 | 27 | ||
| 3300 | 29 | 28 | ||
| 3301 | @@ -31,7 +30,8 @@ | |||
| 3302 | 31 | 30 | ||
| 3303 | 32 | def test_log_transport(self): | 31 | def test_log_transport(self): |
| 3304 | 33 | base_transport = self.get_transport('') | 32 | base_transport = self.get_transport('') |
| 3306 | 34 | logging_transport = get_transport('log+' + base_transport.base) | 33 | logging_transport = transport.get_transport( |
| 3307 | 34 | 'log+' + base_transport.base) | ||
| 3308 | 35 | 35 | ||
| 3309 | 36 | # operations such as mkdir are logged | 36 | # operations such as mkdir are logged |
| 3310 | 37 | mutter('where are you?') | 37 | mutter('where are you?') |
| 3311 | 38 | 38 | ||
| 3312 | === modified file 'bzrlib/tests/test_upgrade.py' | |||
| 3313 | --- bzrlib/tests/test_upgrade.py 2010-02-15 10:46:49 +0000 | |||
| 3314 | +++ bzrlib/tests/test_upgrade.py 2010-06-29 17:48:31 +0000 | |||
| 3315 | @@ -31,13 +31,13 @@ | |||
| 3316 | 31 | bzrdir, | 31 | bzrdir, |
| 3317 | 32 | progress, | 32 | progress, |
| 3318 | 33 | repository, | 33 | repository, |
| 3319 | 34 | transport, | ||
| 3320 | 34 | workingtree, | 35 | workingtree, |
| 3321 | 35 | workingtree_4, | 36 | workingtree_4, |
| 3322 | 36 | ) | 37 | ) |
| 3323 | 37 | import bzrlib.branch | 38 | import bzrlib.branch |
| 3324 | 38 | from bzrlib.branch import Branch | 39 | from bzrlib.branch import Branch |
| 3325 | 39 | from bzrlib.tests import TestCaseWithTransport | 40 | from bzrlib.tests import TestCaseWithTransport |
| 3326 | 40 | from bzrlib.transport import get_transport | ||
| 3327 | 41 | from bzrlib.upgrade import upgrade | 41 | from bzrlib.upgrade import upgrade |
| 3328 | 42 | 42 | ||
| 3329 | 43 | 43 | ||
| 3330 | @@ -80,27 +80,27 @@ | |||
| 3331 | 80 | rt.unlock() | 80 | rt.unlock() |
| 3332 | 81 | # check a backup was made: | 81 | # check a backup was made: |
| 3333 | 82 | backup_dir = 'backup.bzr.~1~' | 82 | backup_dir = 'backup.bzr.~1~' |
| 3355 | 83 | transport = get_transport(b.base) | 83 | t = transport.get_transport(b.base) |
| 3356 | 84 | transport.stat(backup_dir) | 84 | t.stat(backup_dir) |
| 3357 | 85 | transport.stat(backup_dir + '/README') | 85 | t.stat(backup_dir + '/README') |
| 3358 | 86 | transport.stat(backup_dir + '/branch-format') | 86 | t.stat(backup_dir + '/branch-format') |
| 3359 | 87 | transport.stat(backup_dir + '/revision-history') | 87 | t.stat(backup_dir + '/revision-history') |
| 3360 | 88 | transport.stat(backup_dir + '/merged-patches') | 88 | t.stat(backup_dir + '/merged-patches') |
| 3361 | 89 | transport.stat(backup_dir + '/pending-merged-patches') | 89 | t.stat(backup_dir + '/pending-merged-patches') |
| 3362 | 90 | transport.stat(backup_dir + '/pending-merges') | 90 | t.stat(backup_dir + '/pending-merges') |
| 3363 | 91 | transport.stat(backup_dir + '/branch-name') | 91 | t.stat(backup_dir + '/branch-name') |
| 3364 | 92 | transport.stat(backup_dir + '/branch-lock') | 92 | t.stat(backup_dir + '/branch-lock') |
| 3365 | 93 | transport.stat(backup_dir + '/inventory') | 93 | t.stat(backup_dir + '/inventory') |
| 3366 | 94 | transport.stat(backup_dir + '/stat-cache') | 94 | t.stat(backup_dir + '/stat-cache') |
| 3367 | 95 | transport.stat(backup_dir + '/text-store') | 95 | t.stat(backup_dir + '/text-store') |
| 3368 | 96 | transport.stat(backup_dir + '/text-store/foo-20051004035611-1591048e9dc7c2d4.gz') | 96 | t.stat(backup_dir + '/text-store/foo-20051004035611-1591048e9dc7c2d4.gz') |
| 3369 | 97 | transport.stat(backup_dir + '/text-store/foo-20051004035756-4081373d897c3453.gz') | 97 | t.stat(backup_dir + '/text-store/foo-20051004035756-4081373d897c3453.gz') |
| 3370 | 98 | transport.stat(backup_dir + '/inventory-store/') | 98 | t.stat(backup_dir + '/inventory-store/') |
| 3371 | 99 | transport.stat(backup_dir + '/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz') | 99 | t.stat(backup_dir + '/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz') |
| 3372 | 100 | transport.stat(backup_dir + '/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz') | 100 | t.stat(backup_dir + '/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz') |
| 3373 | 101 | transport.stat(backup_dir + '/revision-store/') | 101 | t.stat(backup_dir + '/revision-store/') |
| 3374 | 102 | transport.stat(backup_dir + '/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz') | 102 | t.stat(backup_dir + '/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz') |
| 3375 | 103 | transport.stat(backup_dir + '/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz') | 103 | t.stat(backup_dir + '/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz') |
| 3376 | 104 | 104 | ||
| 3377 | 105 | def test_upgrade_with_ghosts(self): | 105 | def test_upgrade_with_ghosts(self): |
| 3378 | 106 | """Upgrade v0.0.4 tree containing ghost references. | 106 | """Upgrade v0.0.4 tree containing ghost references. |
| 3379 | @@ -153,12 +153,12 @@ | |||
| 3380 | 153 | # such a branch to metadir must not setup a working tree. | 153 | # such a branch to metadir must not setup a working tree. |
| 3381 | 154 | self.build_tree_contents(_upgrade1_template) | 154 | self.build_tree_contents(_upgrade1_template) |
| 3382 | 155 | upgrade('.', bzrdir.BzrDirFormat6()) | 155 | upgrade('.', bzrdir.BzrDirFormat6()) |
| 3386 | 156 | transport = get_transport('.') | 156 | t = transport.get_transport('.') |
| 3387 | 157 | transport.delete_multi(['.bzr/pending-merges', '.bzr/inventory']) | 157 | t.delete_multi(['.bzr/pending-merges', '.bzr/inventory']) |
| 3388 | 158 | self.assertFalse(transport.has('.bzr/stat-cache')) | 158 | self.assertFalse(t.has('.bzr/stat-cache')) |
| 3389 | 159 | # XXX: upgrade fails if a backup.bzr is already present | 159 | # XXX: upgrade fails if a backup.bzr is already present |
| 3390 | 160 | # -- David Allouche 2006-08-11 | 160 | # -- David Allouche 2006-08-11 |
| 3392 | 161 | transport.delete_tree('backup.bzr.~1~') | 161 | t.delete_tree('backup.bzr.~1~') |
| 3393 | 162 | # At this point, we have a format6 branch without checkout files. | 162 | # At this point, we have a format6 branch without checkout files. |
| 3394 | 163 | upgrade('.', bzrdir.BzrDirMetaFormat1()) | 163 | upgrade('.', bzrdir.BzrDirMetaFormat1()) |
| 3395 | 164 | # The upgrade should not have set up a working tree. | 164 | # The upgrade should not have set up a working tree. |
| 3396 | 165 | 165 | ||
| 3397 | === modified file 'bzrlib/tests/test_workingtree.py' | |||
| 3398 | --- bzrlib/tests/test_workingtree.py 2010-04-23 08:51:52 +0000 | |||
| 3399 | +++ bzrlib/tests/test_workingtree.py 2010-06-29 17:48:31 +0000 | |||
| 3400 | @@ -22,6 +22,7 @@ | |||
| 3401 | 22 | bzrdir, | 22 | bzrdir, |
| 3402 | 23 | conflicts, | 23 | conflicts, |
| 3403 | 24 | errors, | 24 | errors, |
| 3404 | 25 | transport, | ||
| 3405 | 25 | workingtree, | 26 | workingtree, |
| 3406 | 26 | ) | 27 | ) |
| 3407 | 27 | from bzrlib.branch import Branch | 28 | from bzrlib.branch import Branch |
| 3408 | @@ -29,7 +30,6 @@ | |||
| 3409 | 29 | from bzrlib.lockdir import LockDir | 30 | from bzrlib.lockdir import LockDir |
| 3410 | 30 | from bzrlib.mutabletree import needs_tree_write_lock | 31 | from bzrlib.mutabletree import needs_tree_write_lock |
| 3411 | 31 | from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped | 32 | from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped |
| 3412 | 32 | from bzrlib.transport import get_transport | ||
| 3413 | 33 | from bzrlib.workingtree import ( | 33 | from bzrlib.workingtree import ( |
| 3414 | 34 | TreeEntry, | 34 | TreeEntry, |
| 3415 | 35 | TreeDirectory, | 35 | TreeDirectory, |
| 3416 | @@ -138,7 +138,7 @@ | |||
| 3417 | 138 | dir.create_repository() | 138 | dir.create_repository() |
| 3418 | 139 | dir.create_branch() | 139 | dir.create_branch() |
| 3419 | 140 | format.initialize(dir) | 140 | format.initialize(dir) |
| 3421 | 141 | t = get_transport(url) | 141 | t = transport.get_transport(url) |
| 3422 | 142 | found_format = workingtree.WorkingTreeFormat.find_format(dir) | 142 | found_format = workingtree.WorkingTreeFormat.find_format(dir) |
| 3423 | 143 | self.failUnless(isinstance(found_format, format.__class__)) | 143 | self.failUnless(isinstance(found_format, format.__class__)) |
| 3424 | 144 | check_format(workingtree.WorkingTreeFormat3(), "bar") | 144 | check_format(workingtree.WorkingTreeFormat3(), "bar") |
| 3425 | 145 | 145 | ||
| 3426 | === modified file 'bzrlib/textmerge.py' | |||
| 3427 | --- bzrlib/textmerge.py 2010-06-04 03:09:35 +0000 | |||
| 3428 | +++ bzrlib/textmerge.py 2010-06-29 17:48:31 +0000 | |||
| 3429 | @@ -1,4 +1,4 @@ | |||
| 3431 | 1 | # Copyright (C) 2005, 2006 Canonical Ltd | 1 | # Copyright (C) 2006, 2009, 2010 Canonical Ltd |
| 3432 | 2 | # | 2 | # |
| 3433 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 3434 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 3435 | 5 | 5 | ||
| 3436 | === modified file 'bzrlib/transport/decorator.py' | |||
| 3437 | --- bzrlib/transport/decorator.py 2010-02-23 07:43:11 +0000 | |||
| 3438 | +++ bzrlib/transport/decorator.py 2010-06-29 17:48:31 +0000 | |||
| 3439 | @@ -20,10 +20,10 @@ | |||
| 3440 | 20 | stub functions to allow other decorators to be written easily. | 20 | stub functions to allow other decorators to be written easily. |
| 3441 | 21 | """ | 21 | """ |
| 3442 | 22 | 22 | ||
| 3447 | 23 | from bzrlib.transport import get_transport, Transport, Server | 23 | from bzrlib import transport |
| 3448 | 24 | 24 | ||
| 3449 | 25 | 25 | ||
| 3450 | 26 | class TransportDecorator(Transport): | 26 | class TransportDecorator(transport.Transport): |
| 3451 | 27 | """A no-change decorator for Transports. | 27 | """A no-change decorator for Transports. |
| 3452 | 28 | 28 | ||
| 3453 | 29 | Subclasses of this are new transports that are based on an | 29 | Subclasses of this are new transports that are based on an |
| 3454 | @@ -50,7 +50,7 @@ | |||
| 3455 | 50 | (url, prefix)) | 50 | (url, prefix)) |
| 3456 | 51 | not_decorated_url = url[len(prefix):] | 51 | not_decorated_url = url[len(prefix):] |
| 3457 | 52 | if _decorated is None: | 52 | if _decorated is None: |
| 3459 | 53 | self._decorated = get_transport(not_decorated_url) | 53 | self._decorated = transport.get_transport(not_decorated_url) |
| 3460 | 54 | else: | 54 | else: |
| 3461 | 55 | self._decorated = _decorated | 55 | self._decorated = _decorated |
| 3462 | 56 | super(TransportDecorator, self).__init__(prefix + self._decorated.base) | 56 | super(TransportDecorator, self).__init__(prefix + self._decorated.base) |
| 3463 | 57 | 57 | ||
| 3464 | === modified file 'bzrlib/transport/remote.py' | |||
| 3465 | --- bzrlib/transport/remote.py 2010-06-16 05:47:02 +0000 | |||
| 3466 | +++ bzrlib/transport/remote.py 2010-06-29 17:48:31 +0000 | |||
| 3467 | @@ -1,4 +1,4 @@ | |||
| 3469 | 1 | # Copyright (C) 2006 Canonical Ltd | 1 | # Copyright (C) 2006-2010 Canonical Ltd |
| 3470 | 2 | # | 2 | # |
| 3471 | 3 | # This program is free software; you can redistribute it and/or modify | 3 | # This program is free software; you can redistribute it and/or modify |
| 3472 | 4 | # it under the terms of the GNU General Public License as published by | 4 | # it under the terms of the GNU General Public License as published by |
| 3473 | 5 | 5 | ||
| 3474 | === modified file 'bzrlib/workingtree.py' | |||
| 3475 | --- bzrlib/workingtree.py 2010-05-25 17:27:52 +0000 | |||
| 3476 | +++ bzrlib/workingtree.py 2010-06-29 17:48:31 +0000 | |||
| 3477 | @@ -61,13 +61,12 @@ | |||
| 3478 | 61 | revisiontree, | 61 | revisiontree, |
| 3479 | 62 | trace, | 62 | trace, |
| 3480 | 63 | transform, | 63 | transform, |
| 3481 | 64 | transport, | ||
| 3482 | 64 | ui, | 65 | ui, |
| 3483 | 65 | views, | 66 | views, |
| 3484 | 66 | xml5, | 67 | xml5, |
| 3485 | 67 | xml7, | 68 | xml7, |
| 3486 | 68 | ) | 69 | ) |
| 3487 | 69 | import bzrlib.branch | ||
| 3488 | 70 | from bzrlib.transport import get_transport | ||
| 3489 | 71 | from bzrlib.workingtree_4 import ( | 70 | from bzrlib.workingtree_4 import ( |
| 3490 | 72 | WorkingTreeFormat4, | 71 | WorkingTreeFormat4, |
| 3491 | 73 | WorkingTreeFormat5, | 72 | WorkingTreeFormat5, |
| 3492 | @@ -369,10 +368,10 @@ | |||
| 3493 | 369 | return True, None | 368 | return True, None |
| 3494 | 370 | else: | 369 | else: |
| 3495 | 371 | return True, tree | 370 | return True, tree |
| 3498 | 372 | transport = get_transport(location) | 371 | t = transport.get_transport(location) |
| 3499 | 373 | iterator = bzrdir.BzrDir.find_bzrdirs(transport, evaluate=evaluate, | 372 | iterator = bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate, |
| 3500 | 374 | list_current=list_current) | 373 | list_current=list_current) |
| 3502 | 375 | return [t for t in iterator if t is not None] | 374 | return [tr for tr in iterator if tr is not None] |
| 3503 | 376 | 375 | ||
| 3504 | 377 | # should be deprecated - this is slow and in any case treating them as a | 376 | # should be deprecated - this is slow and in any case treating them as a |
| 3505 | 378 | # container is (we now know) bad style -- mbp 20070302 | 377 | # container is (we now know) bad style -- mbp 20070302 |
Oh, and it fixes some bugs in the http tests regarding parametrisation, no bugs in the code were uncovered though.