mercurial-scm/hg: tests/test-manifest.py annotate

annotate tests/test-manifest.py @ 45892:06b64fabf91c

copies: cache the ancestor checking call when tracing copy A good share of the time spent in this function is spent doing ancestors checking. To avoid spending time in duplicated call, we cache the result of calls. In the slower case, this provide a quite significant performance boost. Below are the result for a set of selected pairs (many of them pathological): (And further down is another table that summarize the current state of filelog based vs changeset base copy tracing) The benchmark have been configured to be killed after 6 minutes of runtime, which mean that any detect slower than 2 minutes will be marked as "killed". This drop some useful information about how much slower these case are? but also prevent 99% of the benchmark time to be spent on case that can be labelled "very slow" anyway. Repo Case Source-Rev Dest-Rev Old-Time New-Time Difference Factor ------------------------------------------------------------------------------------------------------------------------------------ mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 0.000044 s, 0.000044 s, +0.000000 s, ? 1.0000 mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 0.000138 s, 0.000138 s, +0.000000 s, ? 1.0000 mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 0.005067 s, 0.005052 s, -0.000015 s, ? 0.9970 pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 0.000218 s, 0.000219 s, +0.000001 s, ? 1.0046 pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 0.000053 s, 0.000055 s, +0.000002 s, ? 1.0377 pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 0.000125 s, 0.000128 s, +0.000003 s, ? 1.0240 pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 0.001098 s, 0.001089 s, -0.000009 s, ? 0.9918 pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 0.017546 s, 0.017407 s, -0.000139 s, ? 0.9921 pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 0.096723 s, 0.094175 s, -0.002548 s, ? 0.9737 pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 0.271796 s, 0.238009 s, -0.033787 s, ? 0.8757 pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 0.128602 s, 0.125876 s, -0.002726 s, ? 0.9788 pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 7.086742 s, 3.581556 s, -3.505186 s, ? 0.5054 pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 0.016634 s, 0.016721 s, +0.000087 s, ? 1.0052 pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 0.254225 s, 0.242367 s, -0.011858 s, ? 0.9534 netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 0.000166 s, 0.000165 s, -0.000001 s, ? 0.9940 netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 0.000118 s, 0.000114 s, -0.000004 s, ? 0.9661 netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 0.000296 s, 0.000296 s, +0.000000 s, ? 1.0000 netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 0.001137 s, 0.001124 s, -0.000013 s, ? 0.9886 netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 0.014133 s, 0.013060 s, -0.001073 s, ? 0.9241 netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 0.016988 s, 0.017112 s, +0.000124 s, ? 1.0073 netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 0.676361 s, 0.660350 s, -0.016011 s, ? 0.9763 netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 12.515149 s, 10.032499 s, -2.482650 s, ? 0.8016 mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 0.000186 s, 0.000189 s, +0.000003 s, ? 1.0161 mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 0.000459 s, 0.000462 s, +0.000003 s, ? 1.0065 mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 0.000273 s, 0.000270 s, -0.000003 s, ? 0.9890 mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 0.001503 s, 0.001474 s, -0.000029 s, ? 0.9807 mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 0.004862 s, 0.004806 s, -0.000056 s, ? 0.9885 mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 0.088291 s, 0.085150 s, -0.003141 s, ? 0.9644 mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.007113 s, 0.007064 s, -0.000049 s, ? 0.9931 mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.004687 s, 0.004741 s, +0.000054 s, ? 1.0115 mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 0.198710 s, 0.190133 s, -0.008577 s, ? 0.9568 mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 0.036068 s, 0.035651 s, -0.000417 s, ? 0.9884 mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 0.465362 s, 0.440694 s, -0.024668 s, ? 0.9470 mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 24.519684 s, 18.454163 s, -6.065521 s, ? 0.7526 mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 42.711897 s, 31.562719 s, -11.149178 s, ? 0.7390 mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 0.001201 s, 0.001189 s, -0.000012 s, ? 0.9900 mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 0.001216 s, 0.001204 s, -0.000012 s, ? 0.9901 mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 0.000595 s, 0.000586 s, -0.000009 s, ? 0.9849 mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 0.001856 s, 0.001845 s, -0.000011 s, ? 0.9941 mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 0.064936 s, 0.063822 s, -0.001114 s, ? 0.9828 mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 0.090601 s, 0.088038 s, -0.002563 s, ? 0.9717 mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.007510 s, 0.007389 s, -0.000121 s, ? 0.9839 mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.004911 s, 0.004868 s, -0.000043 s, ? 0.9912 mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 0.233231 s, 0.222450 s, -0.010781 s, ? 0.9538 mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 0.419989 s, 0.370675 s, -0.049314 s, ? 0.8826 mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 0.401521 s, 0.358020 s, -0.043501 s, ? 0.8917 mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 0.179555 s, 0.145235 s, -0.034320 s, ? 0.8089 mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 0.038004 s, 0.037606 s, -0.000398 s, ? 0.9895 mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 52.838482 s, 7.382439 s, -45.456043 s, ? 0.1397 mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 8.705874 s, 7.273506 s, -1.432368 s, ? 0.8355 mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 1.126708 s, 1.074593 s, -0.052115 s, ? 0.9537 mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 83.854020 s, 27.746195 s, -56.107825 s, ? 0.3309 Below is a table comparing the runtime of the current "filelog centric" algorithm, with the "changeset centric" one, we just modified. The changeset centric algorithm is a significant win in many scenario, but they are still various cases where it is quite slower. When many revision has to be considered the cost of retrieving the copy information, creating new dictionaries, merging dictionaries and checking if revision are ancestors of each other can slow things down. The rest of this series, will introduce a rust version of the copy tracing code to deal with most of theses issues. Repo Case Source-Rev Dest-Rev filelog sidedata Difference Factor --------------------------------------------------------------------------------------------------------------------------------------- mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 0.000914 s, 0.000044 s, - 0.000870 s, ? 0.048140 mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 0.001812 s, 0.000138 s, - 0.001674 s, ? 0.076159 mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 0.017954 s, 0.005052 s, - 0.012902 s, ? 0.281386 pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 0.001509 s, 0.000219 s, - 0.001290 s, ? 0.145129 pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 0.206881 s, 0.000055 s, - 0.206826 s, ? 0.000266 pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 0.016951 s, 0.000128 s, - 0.016823 s, ? 0.007551 pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 0.019096 s, 0.001089 s, - 0.018007 s, ? 0.057028 pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 0.762506 s, 0.017407 s, - 0.745099 s, ? 0.022829 pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 1.179211 s, 0.094175 s, - 1.085036 s, ? 0.079863 pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 1.249058 s, 0.238009 s, - 1.011049 s, ? 0.190551 pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 1.614107 s, 0.125876 s, - 1.488231 s, ? 0.077985 pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 0.001064 s, 3.581556 s, + 3.580492 s, ? 3366.124060 pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 1.061275 s, 0.016721 s, - 1.044554 s, ? 0.015756 pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 1.341119 s, 0.242367 s, - 1.098752 s, ? 0.180720 netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 0.027803 s, 0.000165 s, - 0.027638 s, ? 0.005935 netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 0.130014 s, 0.000114 s, - 0.129900 s, ? 0.000877 netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 0.024990 s, 0.000296 s, - 0.024694 s, ? 0.011845 netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 0.052201 s, 0.001124 s, - 0.051077 s, ? 0.021532 netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 0.037642 s, 0.013060 s, - 0.024582 s, ? 0.346953 netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 0.197086 s, 0.017112 s, - 0.179974 s, ? 0.086825 netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 0.935148 s, 0.660350 s, - 0.274798 s, ? 0.706145 netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 3.920674 s, 10.032499 s, + 6.111825 s, ? 2.558871 mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 0.024232 s, 0.000189 s, - 0.024043 s, ? 0.007800 mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 0.141483 s, 0.000462 s, - 0.141021 s, ? 0.003265 mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 0.025775 s, 0.000270 s, - 0.025505 s, ? 0.010475 mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 0.084922 s, 0.001474 s, - 0.083448 s, ? 0.017357 mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 0.194784 s, 0.004806 s, - 0.189978 s, ? 0.024673 mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 2.161103 s, 0.085150 s, - 2.075953 s, ? 0.039401 mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.089347 s, 0.007064 s, - 0.082283 s, ? 0.079063 mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.732171 s, 0.004741 s, - 0.727430 s, ? 0.006475 mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 1.157287 s, 0.190133 s, - 0.967154 s, ? 0.164292 mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 6.726568 s, 0.035651 s, - 6.690917 s, ? 0.005300 mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 3.266229 s, 0.440694 s, - 2.825535 s, ? 0.134924 mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 15.860534 s, 18.454163 s, + 2.593629 s, ? 1.163527 mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 20.450475 s, 31.562719 s, +11.112244 s, ? 1.543373 mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 0.080442 s, 0.001189 s, - 0.079253 s, ? 0.014781 mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 0.497672 s, 0.001204 s, - 0.496468 s, ? 0.002419 mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 0.021183 s, 0.000586 s, - 0.020597 s, ? 0.027664 mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 0.230991 s, 0.001845 s, - 0.229146 s, ? 0.007987 mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 1.118461 s, 0.063822 s, - 1.054639 s, ? 0.057062 mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 2.206083 s, 0.088038 s, - 2.118045 s, ? 0.039907 mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.089404 s, 0.007389 s, - 0.082015 s, ? 0.082647 mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.733043 s, 0.004868 s, - 0.728175 s, ? 0.006641 mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 1.163367 s, 0.222450 s, - 0.940917 s, ? 0.191212 mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 0.085456 s, 0.370675 s, + 0.285219 s, ? 4.337612 mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 0.083601 s, 0.358020 s, + 0.274419 s, ? 4.282485 mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 7.366614 s, 0.145235 s, - 7.221379 s, ? 0.019715 mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 6.664464 s, 0.037606 s, - 6.626858 s, ? 0.005643 mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 7.467836 s, 7.382439 s, - 0.085397 s, ? 0.988565 mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 9.801294 s, 7.273506 s, - 2.527788 s, ? 0.742097 mozilla-try x00000_revs_x_added_0_copies 6a320851d377 1ebb79acd503 : 0.091886 s, killed mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 26.491140 s, 1.074593 s, -25.416547 s, ? 0.040564 mozilla-try x00000_revs_x_added_x_copies 5173c4b6f97c 95d83ee7242d : 0.092863 s, killed mozilla-try x00000_revs_x000_added_x_copies 9126823d0e9c ca82787bb23c : 0.226823 s, killed mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 18.914630 s, 27.746195 s, + 8.831565 s, ? 1.466917 mozilla-try x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 21.198903 s, killed mozilla-try x00000_revs_x00000_added_x000_copies 9b2a99adc05e 8e29777b48e6 : 24.952268 s, killed Differential Revision: https://phab.mercurial-scm.org/D9296

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Mon, 02 Nov 2020 11:03:56 +0100
parents	d0ef8c1dddd4
children	89a2afe31e82

rev	line source
28929 b9ed5a88710c tests: make test-manifest use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 27637 diff changeset	1 from __future__ import absolute_import
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	2
28929 b9ed5a88710c tests: make test-manifest use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 27637 diff changeset	3 import binascii
b9ed5a88710c tests: make test-manifest use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 27637 diff changeset	4 import itertools
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	5 import silenttestrunner
28929 b9ed5a88710c tests: make test-manifest use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 27637 diff changeset	6 import unittest
40599 9eeda7199181 manifest: make sure there's a filename before bothering to look for newline Augie Fackler <augie@google.com> parents: 36373 diff changeset	7 import zlib
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	8
28929 b9ed5a88710c tests: make test-manifest use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 27637 diff changeset	9 from mercurial import (
b9ed5a88710c tests: make test-manifest use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 27637 diff changeset	10 manifest as manifestmod,
b9ed5a88710c tests: make test-manifest use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 27637 diff changeset	11 match as matchmod,
43964 8f67735344ae tests: convert the `root` arg of matchmod.match() to local path separators Matt Harbison <matt_harbison@yahoo.com> parents: 43949 diff changeset	12 util,
28929 b9ed5a88710c tests: make test-manifest use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 27637 diff changeset	13 )
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	14
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	15 EMTPY_MANIFEST = b''
24569 5491248e148a test-manifest: create constant for empty manifest Martin von Zweigbergk <martinvonz@google.com> parents: 24549 diff changeset	16
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	17 HASH_1 = b'1' * 40
24570 487245cbf1ab test-manifest: extract constants for binary hashes Martin von Zweigbergk <martinvonz@google.com> parents: 24569 diff changeset	18 BIN_HASH_1 = binascii.unhexlify(HASH_1)
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	19 HASH_2 = b'f' * 40
24570 487245cbf1ab test-manifest: extract constants for binary hashes Martin von Zweigbergk <martinvonz@google.com> parents: 24569 diff changeset	20 BIN_HASH_2 = binascii.unhexlify(HASH_2)
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	21 HASH_3 = b'1234567890abcdef0987654321deadbeef0fcafe'
24570 487245cbf1ab test-manifest: extract constants for binary hashes Martin von Zweigbergk <martinvonz@google.com> parents: 24569 diff changeset	22 BIN_HASH_3 = binascii.unhexlify(HASH_3)
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	23 A_SHORT_MANIFEST = (
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	24 b'bar/baz/qux.py\0%(hash2)s%(flag2)s\n' b'foo\0%(hash1)s%(flag1)s\n'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	25 ) % {b'hash1': HASH_1, b'flag1': b'', b'hash2': HASH_2, b'flag2': b'l',}
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	26
24549 bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	27 A_DEEPER_MANIFEST = (
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	28 b'a/b/c/bar.py\0%(hash3)s%(flag1)s\n'
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	29 b'a/b/c/bar.txt\0%(hash1)s%(flag1)s\n'
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	30 b'a/b/c/foo.py\0%(hash3)s%(flag1)s\n'
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	31 b'a/b/c/foo.txt\0%(hash2)s%(flag2)s\n'
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	32 b'a/b/d/baz.py\0%(hash3)s%(flag1)s\n'
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	33 b'a/b/d/qux.py\0%(hash1)s%(flag2)s\n'
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	34 b'a/b/d/ten.txt\0%(hash3)s%(flag2)s\n'
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	35 b'a/b/dog.py\0%(hash3)s%(flag1)s\n'
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	36 b'a/b/fish.py\0%(hash2)s%(flag1)s\n'
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	37 b'a/c/london.py\0%(hash3)s%(flag2)s\n'
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	38 b'a/c/paper.txt\0%(hash2)s%(flag2)s\n'
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	39 b'a/c/paris.py\0%(hash2)s%(flag1)s\n'
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	40 b'a/d/apple.py\0%(hash3)s%(flag1)s\n'
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	41 b'a/d/pizza.py\0%(hash3)s%(flag2)s\n'
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	42 b'a/green.py\0%(hash1)s%(flag2)s\n'
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	43 b'a/purple.py\0%(hash2)s%(flag1)s\n'
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	44 b'app.py\0%(hash3)s%(flag1)s\n'
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	45 b'readme.txt\0%(hash2)s%(flag1)s\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	46 ) % {
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	47 b'hash1': HASH_1,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	48 b'flag1': b'',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	49 b'hash2': HASH_2,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	50 b'flag2': b'l',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	51 b'hash3': HASH_3,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	52 }
24549 bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	53
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	54 HUGE_MANIFEST_ENTRIES = 200001
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	55
32534 0048a852b6aa tests: make test-manifest finish importing in Python 3 Augie Fackler <raf@durin42.com> parents: 32533 diff changeset	56 izip = getattr(itertools, 'izip', zip)
0048a852b6aa tests: make test-manifest finish importing in Python 3 Augie Fackler <raf@durin42.com> parents: 32533 diff changeset	57 if 'xrange' not in globals():
0048a852b6aa tests: make test-manifest finish importing in Python 3 Augie Fackler <raf@durin42.com> parents: 32533 diff changeset	58 xrange = range
0048a852b6aa tests: make test-manifest finish importing in Python 3 Augie Fackler <raf@durin42.com> parents: 32533 diff changeset	59
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	60 A_HUGE_MANIFEST = b''.join(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	61 sorted(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	62 b'file%d\0%s%s\n' % (i, h, f)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	63 for i, h, f in izip(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	64 xrange(200001),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	65 itertools.cycle((HASH_1, HASH_2)),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	66 itertools.cycle((b'', b'x', b'l')),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	67 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	68 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	69 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	70
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	71
24655 528ace39c85c test-manifest: make manifesttest a base class that is extended Drew Gottlieb <drgott@google.com> parents: 24654 diff changeset	72 class basemanifesttests(object):
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	73 def parsemanifest(self, text):
24655 528ace39c85c test-manifest: make manifesttest a base class that is extended Drew Gottlieb <drgott@google.com> parents: 24654 diff changeset	74 raise NotImplementedError('parsemanifest not implemented by test case')
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	75
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	76 def testEmptyManifest(self):
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	77 m = self.parsemanifest(EMTPY_MANIFEST)
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	78 self.assertEqual(0, len(m))
24466 f310ca66a704 test-manifest.py: rewrite tests in terms of manifestdict Martin von Zweigbergk <martinvonz@google.com> parents: 24465 diff changeset	79 self.assertEqual([], list(m))
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	80
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	81 def testManifest(self):
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	82 m = self.parsemanifest(A_SHORT_MANIFEST)
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	83 self.assertEqual([b'bar/baz/qux.py', b'foo'], list(m))
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	84 self.assertEqual(BIN_HASH_2, m[b'bar/baz/qux.py'])
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	85 self.assertEqual(b'l', m.flags(b'bar/baz/qux.py'))
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	86 self.assertEqual(BIN_HASH_1, m[b'foo'])
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	87 self.assertEqual(b'', m.flags(b'foo'))
32279 68c43a416585 tests: use context manager form of assertRaises Gregory Szorc <gregory.szorc@gmail.com> parents: 31876 diff changeset	88 with self.assertRaises(KeyError):
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	89 m[b'wat']
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	90
44707 9d569983668b manifest: add test for long hashes Augie Fackler <augie@google.com> parents: 44352 diff changeset	91 def testManifestLongHashes(self):
9d569983668b manifest: add test for long hashes Augie Fackler <augie@google.com> parents: 44352 diff changeset	92 m = self.parsemanifest(b'a\0' + b'f' * 64 + b'\n')
9d569983668b manifest: add test for long hashes Augie Fackler <augie@google.com> parents: 44352 diff changeset	93 self.assertEqual(binascii.unhexlify(b'f' * 64), m[b'a'])
9d569983668b manifest: add test for long hashes Augie Fackler <augie@google.com> parents: 44352 diff changeset	94
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	95 def testSetItem(self):
24570 487245cbf1ab test-manifest: extract constants for binary hashes Martin von Zweigbergk <martinvonz@google.com> parents: 24569 diff changeset	96 want = BIN_HASH_1
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	97
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	98 m = self.parsemanifest(EMTPY_MANIFEST)
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	99 m[b'a'] = want
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	100 self.assertIn(b'a', m)
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	101 self.assertEqual(want, m[b'a'])
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	102 self.assertEqual(b'a\0' + HASH_1 + b'\n', m.text())
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	103
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	104 m = self.parsemanifest(A_SHORT_MANIFEST)
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	105 m[b'a'] = want
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	106 self.assertEqual(want, m[b'a'])
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	107 self.assertEqual(b'a\0' + HASH_1 + b'\n' + A_SHORT_MANIFEST, m.text())
24465 bb8e2b1a0803 test-manifest.py: separate out test for double-free after copy() Martin von Zweigbergk <martinvonz@google.com> parents: 24298 diff changeset	108
24466 f310ca66a704 test-manifest.py: rewrite tests in terms of manifestdict Martin von Zweigbergk <martinvonz@google.com> parents: 24465 diff changeset	109 def testSetFlag(self):
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	110 want = b'x'
24466 f310ca66a704 test-manifest.py: rewrite tests in terms of manifestdict Martin von Zweigbergk <martinvonz@google.com> parents: 24465 diff changeset	111
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	112 m = self.parsemanifest(EMTPY_MANIFEST)
24466 f310ca66a704 test-manifest.py: rewrite tests in terms of manifestdict Martin von Zweigbergk <martinvonz@google.com> parents: 24465 diff changeset	113 # first add a file; a file-less flag makes no sense
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	114 m[b'a'] = BIN_HASH_1
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	115 m.setflag(b'a', want)
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	116 self.assertEqual(want, m.flags(b'a'))
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	117 self.assertEqual(b'a\0' + HASH_1 + want + b'\n', m.text())
24466 f310ca66a704 test-manifest.py: rewrite tests in terms of manifestdict Martin von Zweigbergk <martinvonz@google.com> parents: 24465 diff changeset	118
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	119 m = self.parsemanifest(A_SHORT_MANIFEST)
24466 f310ca66a704 test-manifest.py: rewrite tests in terms of manifestdict Martin von Zweigbergk <martinvonz@google.com> parents: 24465 diff changeset	120 # first add a file; a file-less flag makes no sense
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	121 m[b'a'] = BIN_HASH_1
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	122 m.setflag(b'a', want)
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	123 self.assertEqual(want, m.flags(b'a'))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	124 self.assertEqual(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	125 b'a\0' + HASH_1 + want + b'\n' + A_SHORT_MANIFEST, m.text()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	126 )
24466 f310ca66a704 test-manifest.py: rewrite tests in terms of manifestdict Martin von Zweigbergk <martinvonz@google.com> parents: 24465 diff changeset	127
24465 bb8e2b1a0803 test-manifest.py: separate out test for double-free after copy() Martin von Zweigbergk <martinvonz@google.com> parents: 24298 diff changeset	128 def testCopy(self):
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	129 m = self.parsemanifest(A_SHORT_MANIFEST)
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	130 m[b'a'] = BIN_HASH_1
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	131 m2 = m.copy()
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	132 del m
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	133 del m2 # make sure we don't double free() anything
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	134
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	135 def testCompaction(self):
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	136 unhex = binascii.unhexlify
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	137 h1, h2 = unhex(HASH_1), unhex(HASH_2)
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	138 m = self.parsemanifest(A_SHORT_MANIFEST)
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	139 m[b'alpha'] = h1
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	140 m[b'beta'] = h2
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	141 del m[b'foo']
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	142 want = b'alpha\0%s\nbar/baz/qux.py\0%sl\nbeta\0%s\n' % (
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	143 HASH_1,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	144 HASH_2,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	145 HASH_2,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	146 )
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	147 self.assertEqual(want, m.text())
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	148 self.assertEqual(3, len(m))
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	149 self.assertEqual([b'alpha', b'bar/baz/qux.py', b'beta'], list(m))
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	150 self.assertEqual(h1, m[b'alpha'])
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	151 self.assertEqual(h2, m[b'bar/baz/qux.py'])
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	152 self.assertEqual(h2, m[b'beta'])
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	153 self.assertEqual(b'', m.flags(b'alpha'))
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	154 self.assertEqual(b'l', m.flags(b'bar/baz/qux.py'))
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	155 self.assertEqual(b'', m.flags(b'beta'))
32279 68c43a416585 tests: use context manager form of assertRaises Gregory Szorc <gregory.szorc@gmail.com> parents: 31876 diff changeset	156 with self.assertRaises(KeyError):
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	157 m[b'foo']
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	158
24466 f310ca66a704 test-manifest.py: rewrite tests in terms of manifestdict Martin von Zweigbergk <martinvonz@google.com> parents: 24465 diff changeset	159 def testMatchException(self):
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	160 m = self.parsemanifest(A_SHORT_MANIFEST)
43964 8f67735344ae tests: convert the `root` arg of matchmod.match() to local path separators Matt Harbison <matt_harbison@yahoo.com> parents: 43949 diff changeset	161 match = matchmod.match(util.localpath(b'/repo'), b'', [b're:.*'])
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	162
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	163 def filt(path):
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	164 if path == b'foo':
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	165 assert False
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	166 return True
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	167
24466 f310ca66a704 test-manifest.py: rewrite tests in terms of manifestdict Martin von Zweigbergk <martinvonz@google.com> parents: 24465 diff changeset	168 match.matchfn = filt
32279 68c43a416585 tests: use context manager form of assertRaises Gregory Szorc <gregory.szorc@gmail.com> parents: 31876 diff changeset	169 with self.assertRaises(AssertionError):
44352 0bf3b5e80d30 manifest: move matches method to be outside the interface Augie Fackler <augie@google.com> parents: 43964 diff changeset	170 m._matches(match)
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	171
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	172 def testRemoveItem(self):
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	173 m = self.parsemanifest(A_SHORT_MANIFEST)
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	174 del m[b'foo']
32279 68c43a416585 tests: use context manager form of assertRaises Gregory Szorc <gregory.szorc@gmail.com> parents: 31876 diff changeset	175 with self.assertRaises(KeyError):
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	176 m[b'foo']
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	177 self.assertEqual(1, len(m))
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	178 self.assertEqual(1, len(list(m)))
24228 542c891274b2 lazymanifest: use a binary search to do an insertion Augie Fackler <augie@google.com> parents: 24225 diff changeset	179 # now restore and make sure everything works right
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	180 m[b'foo'] = b'a' * 20
24228 542c891274b2 lazymanifest: use a binary search to do an insertion Augie Fackler <augie@google.com> parents: 24225 diff changeset	181 self.assertEqual(2, len(m))
542c891274b2 lazymanifest: use a binary search to do an insertion Augie Fackler <augie@google.com> parents: 24225 diff changeset	182 self.assertEqual(2, len(list(m)))
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	183
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	184 def testManifestDiff(self):
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	185 MISSING = (None, b'')
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	186 addl = b'z-only-in-left\0' + HASH_1 + b'\n'
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	187 addr = b'z-only-in-right\0' + HASH_2 + b'x\n'
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	188 left = self.parsemanifest(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	189 A_SHORT_MANIFEST.replace(HASH_1, HASH_3 + b'x') + addl
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	190 )
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	191 right = self.parsemanifest(A_SHORT_MANIFEST + addr)
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	192 want = {
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	193 b'foo': ((BIN_HASH_3, b'x'), (BIN_HASH_1, b'')),
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	194 b'z-only-in-left': ((BIN_HASH_1, b''), MISSING),
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	195 b'z-only-in-right': (MISSING, (BIN_HASH_2, b'x')),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	196 }
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	197 self.assertEqual(want, left.diff(right))
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	198
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	199 want = {
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	200 b'bar/baz/qux.py': (MISSING, (BIN_HASH_2, b'l')),
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	201 b'foo': (MISSING, (BIN_HASH_3, b'x')),
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	202 b'z-only-in-left': (MISSING, (BIN_HASH_1, b'')),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	203 }
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	204 self.assertEqual(want, self.parsemanifest(EMTPY_MANIFEST).diff(left))
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	205
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	206 want = {
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	207 b'bar/baz/qux.py': ((BIN_HASH_2, b'l'), MISSING),
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	208 b'foo': ((BIN_HASH_3, b'x'), MISSING),
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	209 b'z-only-in-left': ((BIN_HASH_1, b''), MISSING),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	210 }
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	211 self.assertEqual(want, left.diff(self.parsemanifest(EMTPY_MANIFEST)))
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	212 copy = right.copy()
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	213 del copy[b'z-only-in-right']
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	214 del right[b'foo']
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	215 want = {
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	216 b'foo': (MISSING, (BIN_HASH_1, b'')),
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	217 b'z-only-in-right': ((BIN_HASH_2, b'x'), MISSING),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	218 }
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	219 self.assertEqual(want, right.diff(copy))
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	220
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	221 short = self.parsemanifest(A_SHORT_MANIFEST)
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	222 pruned = short.copy()
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	223 del pruned[b'foo']
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	224 want = {
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	225 b'foo': ((BIN_HASH_1, b''), MISSING),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	226 }
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	227 self.assertEqual(want, short.diff(pruned))
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	228 want = {
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	229 b'foo': (MISSING, (BIN_HASH_1, b'')),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	230 }
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	231 self.assertEqual(want, pruned.diff(short))
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	232 want = {
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	233 b'bar/baz/qux.py': None,
0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	234 b'foo': (MISSING, (BIN_HASH_1, b'')),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	235 }
31255 959ebff3505a manifest: add match argument to diff and filesnotin Durham Goode <durham@fb.com> parents: 28929 diff changeset	236 self.assertEqual(want, pruned.diff(short, clean=True))
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	237
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	238 def testReversedLines(self):
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	239 backwards = b''.join(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	240 l + b'\n' for l in reversed(A_SHORT_MANIFEST.split(b'\n')) if l
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	241 )
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	242 try:
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	243 self.parsemanifest(backwards)
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	244 self.fail('Should have raised ValueError')
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 24656 diff changeset	245 except ValueError as v:
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	246 self.assertIn('Manifest lines not in sorted order.', str(v))
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	247
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	248 def testNoTerminalNewline(self):
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	249 try:
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	250 self.parsemanifest(A_SHORT_MANIFEST + b'wat')
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	251 self.fail('Should have raised ValueError')
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 24656 diff changeset	252 except ValueError as v:
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	253 self.assertIn('Manifest did not end in a newline.', str(v))
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	254
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	255 def testNoNewLineAtAll(self):
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	256 try:
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	257 self.parsemanifest(b'wat')
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	258 self.fail('Should have raised ValueError')
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 24656 diff changeset	259 except ValueError as v:
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	260 self.assertIn('Manifest did not end in a newline.', str(v))
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	261
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	262 def testHugeManifest(self):
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	263 m = self.parsemanifest(A_HUGE_MANIFEST)
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	264 self.assertEqual(HUGE_MANIFEST_ENTRIES, len(m))
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	265 self.assertEqual(len(m), len(list(m)))
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	266
24549 bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	267 def testMatchesMetadata(self):
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	268 '''Tests matches() for a few specific files to make sure that both
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	269 the set of files as well as their flags and nodeids are correct in
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	270 the resulting manifest.'''
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	271 m = self.parsemanifest(A_HUGE_MANIFEST)
24495 d2a3a2808974 manifest: make manifest.intersectfiles() internal Drew Gottlieb <drgott@google.com> parents: 24468 diff changeset	272
41676 0531dff73d0b match: delete unused root and cwd arguments from {always,never,exact}() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41621 diff changeset	273 match = matchmod.exact([b'file1', b'file200', b'file300'])
44352 0bf3b5e80d30 manifest: move matches method to be outside the interface Augie Fackler <augie@google.com> parents: 43964 diff changeset	274 m2 = m._matches(match)
24495 d2a3a2808974 manifest: make manifest.intersectfiles() internal Drew Gottlieb <drgott@google.com> parents: 24468 diff changeset	275
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	276 w = (b'file1\0%sx\n' b'file200\0%sl\n' b'file300\0%s\n') % (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	277 HASH_2,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	278 HASH_1,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	279 HASH_1,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	280 )
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24214 diff changeset	281 self.assertEqual(w, m2.text())
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	282
24549 bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	283 def testMatchesNonexistentFile(self):
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	284 '''Tests matches() for a small set of specific files, including one
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	285 nonexistent file to make sure in only matches against existing files.
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	286 '''
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	287 m = self.parsemanifest(A_DEEPER_MANIFEST)
24549 bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	288
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	289 match = matchmod.exact(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	290 [b'a/b/c/bar.txt', b'a/b/d/qux.py', b'readme.txt', b'nonexistent']
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	291 )
44352 0bf3b5e80d30 manifest: move matches method to be outside the interface Augie Fackler <augie@google.com> parents: 43964 diff changeset	292 m2 = m._matches(match)
24549 bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	293
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	294 self.assertEqual(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	295 [b'a/b/c/bar.txt', b'a/b/d/qux.py', b'readme.txt'], m2.keys()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	296 )
24549 bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	297
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	298 def testMatchesNonexistentDirectory(self):
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	299 '''Tests matches() for a relpath match on a directory that doesn't
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	300 actually exist.'''
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	301 m = self.parsemanifest(A_DEEPER_MANIFEST)
24549 bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	302
43964 8f67735344ae tests: convert the `root` arg of matchmod.match() to local path separators Matt Harbison <matt_harbison@yahoo.com> parents: 43949 diff changeset	303 match = matchmod.match(
8f67735344ae tests: convert the `root` arg of matchmod.match() to local path separators Matt Harbison <matt_harbison@yahoo.com> parents: 43949 diff changeset	304 util.localpath(b'/repo'), b'', [b'a/f'], default=b'relpath'
8f67735344ae tests: convert the `root` arg of matchmod.match() to local path separators Matt Harbison <matt_harbison@yahoo.com> parents: 43949 diff changeset	305 )
44352 0bf3b5e80d30 manifest: move matches method to be outside the interface Augie Fackler <augie@google.com> parents: 43964 diff changeset	306 m2 = m._matches(match)
24549 bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	307
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	308 self.assertEqual([], m2.keys())
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	309
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	310 def testMatchesExactLarge(self):
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	311 '''Tests matches() for files matching a large list of exact files.
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	312 '''
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	313 m = self.parsemanifest(A_HUGE_MANIFEST)
24549 bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	314
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	315 flist = m.keys()[80:300]
41676 0531dff73d0b match: delete unused root and cwd arguments from {always,never,exact}() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41621 diff changeset	316 match = matchmod.exact(flist)
44352 0bf3b5e80d30 manifest: move matches method to be outside the interface Augie Fackler <augie@google.com> parents: 43964 diff changeset	317 m2 = m._matches(match)
24549 bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	318
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	319 self.assertEqual(flist, m2.keys())
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	320
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	321 def testMatchesFull(self):
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	322 '''Tests matches() for what should be a full match.'''
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	323 m = self.parsemanifest(A_DEEPER_MANIFEST)
24549 bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	324
43964 8f67735344ae tests: convert the `root` arg of matchmod.match() to local path separators Matt Harbison <matt_harbison@yahoo.com> parents: 43949 diff changeset	325 match = matchmod.match(util.localpath(b'/repo'), b'', [b''])
44352 0bf3b5e80d30 manifest: move matches method to be outside the interface Augie Fackler <augie@google.com> parents: 43964 diff changeset	326 m2 = m._matches(match)
24549 bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	327
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	328 self.assertEqual(m.keys(), m2.keys())
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	329
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	330 def testMatchesDirectory(self):
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	331 '''Tests matches() on a relpath match on a directory, which should
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	332 match against all files within said directory.'''
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	333 m = self.parsemanifest(A_DEEPER_MANIFEST)
24549 bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	334
43964 8f67735344ae tests: convert the `root` arg of matchmod.match() to local path separators Matt Harbison <matt_harbison@yahoo.com> parents: 43949 diff changeset	335 match = matchmod.match(
8f67735344ae tests: convert the `root` arg of matchmod.match() to local path separators Matt Harbison <matt_harbison@yahoo.com> parents: 43949 diff changeset	336 util.localpath(b'/repo'), b'', [b'a/b'], default=b'relpath'
8f67735344ae tests: convert the `root` arg of matchmod.match() to local path separators Matt Harbison <matt_harbison@yahoo.com> parents: 43949 diff changeset	337 )
44352 0bf3b5e80d30 manifest: move matches method to be outside the interface Augie Fackler <augie@google.com> parents: 43964 diff changeset	338 m2 = m._matches(match)
24549 bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	339
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	340 self.assertEqual(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	341 [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	342 b'a/b/c/bar.py',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	343 b'a/b/c/bar.txt',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	344 b'a/b/c/foo.py',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	345 b'a/b/c/foo.txt',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	346 b'a/b/d/baz.py',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	347 b'a/b/d/qux.py',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	348 b'a/b/d/ten.txt',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	349 b'a/b/dog.py',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	350 b'a/b/fish.py',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	351 ],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	352 m2.keys(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	353 )
24549 bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	354
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	355 def testMatchesExactPath(self):
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	356 '''Tests matches() on an exact match on a directory, which should
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	357 result in an empty manifest because you can't perform an exact match
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	358 against a directory.'''
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	359 m = self.parsemanifest(A_DEEPER_MANIFEST)
24549 bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	360
41676 0531dff73d0b match: delete unused root and cwd arguments from {always,never,exact}() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41621 diff changeset	361 match = matchmod.exact([b'a/b'])
44352 0bf3b5e80d30 manifest: move matches method to be outside the interface Augie Fackler <augie@google.com> parents: 43964 diff changeset	362 m2 = m._matches(match)
24549 bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	363
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	364 self.assertEqual([], m2.keys())
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	365
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	366 def testMatchesCwd(self):
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	367 '''Tests matches() on a relpath match with the current directory ('.')
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	368 when not in the root directory.'''
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	369 m = self.parsemanifest(A_DEEPER_MANIFEST)
24549 bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	370
43964 8f67735344ae tests: convert the `root` arg of matchmod.match() to local path separators Matt Harbison <matt_harbison@yahoo.com> parents: 43949 diff changeset	371 match = matchmod.match(
8f67735344ae tests: convert the `root` arg of matchmod.match() to local path separators Matt Harbison <matt_harbison@yahoo.com> parents: 43949 diff changeset	372 util.localpath(b'/repo'), b'a/b', [b'.'], default=b'relpath'
8f67735344ae tests: convert the `root` arg of matchmod.match() to local path separators Matt Harbison <matt_harbison@yahoo.com> parents: 43949 diff changeset	373 )
44352 0bf3b5e80d30 manifest: move matches method to be outside the interface Augie Fackler <augie@google.com> parents: 43964 diff changeset	374 m2 = m._matches(match)
24549 bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	375
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	376 self.assertEqual(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	377 [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	378 b'a/b/c/bar.py',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	379 b'a/b/c/bar.txt',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	380 b'a/b/c/foo.py',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	381 b'a/b/c/foo.txt',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	382 b'a/b/d/baz.py',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	383 b'a/b/d/qux.py',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	384 b'a/b/d/ten.txt',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	385 b'a/b/dog.py',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	386 b'a/b/fish.py',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	387 ],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	388 m2.keys(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	389 )
24549 bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	390
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	391 def testMatchesWithPattern(self):
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	392 '''Tests matches() for files matching a pattern that reside
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	393 deeper than the specified directory.'''
24654 9d6db63ccf00 test-manifest: move parsemanifest() to be a testmanifest class method Drew Gottlieb <drgott@google.com> parents: 24573 diff changeset	394 m = self.parsemanifest(A_DEEPER_MANIFEST)
24549 bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	395
43964 8f67735344ae tests: convert the `root` arg of matchmod.match() to local path separators Matt Harbison <matt_harbison@yahoo.com> parents: 43949 diff changeset	396 match = matchmod.match(util.localpath(b'/repo'), b'', [b'a/b//.txt'])
44352 0bf3b5e80d30 manifest: move matches method to be outside the interface Augie Fackler <augie@google.com> parents: 43964 diff changeset	397 m2 = m._matches(match)
24549 bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	398
bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	399 self.assertEqual(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	400 [b'a/b/c/bar.txt', b'a/b/c/foo.txt', b'a/b/d/ten.txt'], m2.keys()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	401 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	402
24549 bcf0de51326e manifest: add some tests for manifest.matches() Drew Gottlieb <drgott@google.com> parents: 24495 diff changeset	403
24655 528ace39c85c test-manifest: make manifesttest a base class that is extended Drew Gottlieb <drgott@google.com> parents: 24654 diff changeset	404 class testmanifestdict(unittest.TestCase, basemanifesttests):
528ace39c85c test-manifest: make manifesttest a base class that is extended Drew Gottlieb <drgott@google.com> parents: 24654 diff changeset	405 def parsemanifest(self, text):
528ace39c85c test-manifest: make manifesttest a base class that is extended Drew Gottlieb <drgott@google.com> parents: 24654 diff changeset	406 return manifestmod.manifestdict(text)
528ace39c85c test-manifest: make manifesttest a base class that is extended Drew Gottlieb <drgott@google.com> parents: 24654 diff changeset	407
40599 9eeda7199181 manifest: make sure there's a filename before bothering to look for newline Augie Fackler <augie@google.com> parents: 36373 diff changeset	408 def testObviouslyBogusManifest(self):
9eeda7199181 manifest: make sure there's a filename before bothering to look for newline Augie Fackler <augie@google.com> parents: 36373 diff changeset	409 # This is a 163k manifest that came from oss-fuzz. It was a
9eeda7199181 manifest: make sure there's a filename before bothering to look for newline Augie Fackler <augie@google.com> parents: 36373 diff changeset	410 # timeout there, but when run normally it doesn't seem to
9eeda7199181 manifest: make sure there's a filename before bothering to look for newline Augie Fackler <augie@google.com> parents: 36373 diff changeset	411 # present any particular slowness.
9eeda7199181 manifest: make sure there's a filename before bothering to look for newline Augie Fackler <augie@google.com> parents: 36373 diff changeset	412 data = zlib.decompress(
40629 ab59cc71f80c tests: fix bytes/str issue I introduced when adding this test Augie Fackler <augie@google.com> parents: 40599 diff changeset	413 b'x\x9c\xed\xce;\n\x83\x00\x10\x04\xd0\x8deNa\x93~\xf1\x03\xc9q\xf4'
ab59cc71f80c tests: fix bytes/str issue I introduced when adding this test Augie Fackler <augie@google.com> parents: 40599 diff changeset	414 b'\x14\xeaU\xbdB\xda\xd4\xe6Cj\xc1FA\xde+\x86\xe9f\xa2\xfci\xbb\xfb'
ab59cc71f80c tests: fix bytes/str issue I introduced when adding this test Augie Fackler <augie@google.com> parents: 40599 diff changeset	415 b'\xa3\xef\xea\xba\xca\x7fk\x86q\x9a\xc6\xc8\xcc&\xb3\xcf\xf8\xb8\|#'
ab59cc71f80c tests: fix bytes/str issue I introduced when adding this test Augie Fackler <augie@google.com> parents: 40599 diff changeset	416 b'\x8a9\x00\xd8\xe6v\xf4\x01N\xe1\n\x00\x00\x00\x00\x00\x00\x00\x00'
ab59cc71f80c tests: fix bytes/str issue I introduced when adding this test Augie Fackler <augie@google.com> parents: 40599 diff changeset	417 b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
ab59cc71f80c tests: fix bytes/str issue I introduced when adding this test Augie Fackler <augie@google.com> parents: 40599 diff changeset	418 b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
ab59cc71f80c tests: fix bytes/str issue I introduced when adding this test Augie Fackler <augie@google.com> parents: 40599 diff changeset	419 b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
ab59cc71f80c tests: fix bytes/str issue I introduced when adding this test Augie Fackler <augie@google.com> parents: 40599 diff changeset	420 b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
ab59cc71f80c tests: fix bytes/str issue I introduced when adding this test Augie Fackler <augie@google.com> parents: 40599 diff changeset	421 b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
ab59cc71f80c tests: fix bytes/str issue I introduced when adding this test Augie Fackler <augie@google.com> parents: 40599 diff changeset	422 b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
ab59cc71f80c tests: fix bytes/str issue I introduced when adding this test Augie Fackler <augie@google.com> parents: 40599 diff changeset	423 b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
ab59cc71f80c tests: fix bytes/str issue I introduced when adding this test Augie Fackler <augie@google.com> parents: 40599 diff changeset	424 b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
ab59cc71f80c tests: fix bytes/str issue I introduced when adding this test Augie Fackler <augie@google.com> parents: 40599 diff changeset	425 b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
ab59cc71f80c tests: fix bytes/str issue I introduced when adding this test Augie Fackler <augie@google.com> parents: 40599 diff changeset	426 b'\x00\x00\xc0\x8aey\x1d}\x01\xd8\xe0\xb9\xf3\xde\x1b\xcf\x17'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	427 b'\xac\xbe'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	428 )
40599 9eeda7199181 manifest: make sure there's a filename before bothering to look for newline Augie Fackler <augie@google.com> parents: 36373 diff changeset	429 with self.assertRaises(ValueError):
9eeda7199181 manifest: make sure there's a filename before bothering to look for newline Augie Fackler <augie@google.com> parents: 36373 diff changeset	430 self.parsemanifest(data)
9eeda7199181 manifest: make sure there's a filename before bothering to look for newline Augie Fackler <augie@google.com> parents: 36373 diff changeset	431
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	432
24656 29c238e4a58a test-manifest: add some test coverage for treemanifest Drew Gottlieb <drgott@google.com> parents: 24655 diff changeset	433 class testtreemanifest(unittest.TestCase, basemanifesttests):
29c238e4a58a test-manifest: add some test coverage for treemanifest Drew Gottlieb <drgott@google.com> parents: 24655 diff changeset	434 def parsemanifest(self, text):
32551 0ff336a42c39 tests: make test-manifest.py portable to Python 3 Augie Fackler <raf@durin42.com> parents: 32534 diff changeset	435 return manifestmod.treemanifest(b'', text)
24656 29c238e4a58a test-manifest: add some test coverage for treemanifest Drew Gottlieb <drgott@google.com> parents: 24655 diff changeset	436
31876 94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31255 diff changeset	437 def testWalkSubtrees(self):
94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31255 diff changeset	438 m = self.parsemanifest(A_DEEPER_MANIFEST)
94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31255 diff changeset	439
94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31255 diff changeset	440 dirs = [s._dir for s in m.walksubtrees()]
94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31255 diff changeset	441 self.assertEqual(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	442 sorted(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	443 [b'', b'a/', b'a/c/', b'a/d/', b'a/b/', b'a/b/c/', b'a/b/d/']
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	444 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	445 sorted(dirs),
31876 94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31255 diff changeset	446 )
94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31255 diff changeset	447
43964 8f67735344ae tests: convert the `root` arg of matchmod.match() to local path separators Matt Harbison <matt_harbison@yahoo.com> parents: 43949 diff changeset	448 match = matchmod.match(util.localpath(b'/repo'), b'', [b'path:a/b/'])
31876 94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31255 diff changeset	449 dirs = [s._dir for s in m.walksubtrees(matcher=match)]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	450 self.assertEqual(sorted([b'a/b/', b'a/b/c/', b'a/b/d/']), sorted(dirs))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41676 diff changeset	451
31876 94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31255 diff changeset	452
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	453 if __name__ == '__main__':
a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: diff changeset	454 silenttestrunner.main(__name__)

Mercurial > public > mercurial-scm > hg

annotate tests/test-manifest.py @ 45892:06b64fabf91c