Author: hwright
Date: Thu Nov 18 16:30:32 2010
New Revision: 1036520
URL: http://svn.apache.org/viewvc?rev=1036520&view=rev
Log:
Merge r991972 from trunk, using special merge magic:
* r991972
Replace os.rename(src,dst) with shutil.move() while setting up authz files
in the test suite.
Notes:
On most linux variants, os.rename(src,dst) will tolerate an existing
dst, but Windows will not. The change to use os.rename() was made in
the backport of r991534.
Justification:
With r991534 backported, we can no longer run the dav tests on Windows
without this change.
Branch:
No branch is required, however r991972 was made in sandbox.py, which
doesn't exist on 1.6.x. A file merge from sandbox.py to main.py on
the 1.6.x branch will cleanly apply the one line change, i.e.:
svn merge ^/subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py
subversion/tests/cmdline/svntest/main.py -c991972
Votes:
+1: pburba, stsp, rhuijben
Modified:
subversion/branches/1.6.x/STATUS
subversion/branches/1.6.x/subversion/tests/cmdline/svntest/main.py
(contents, props changed)
Modified: subversion/branches/1.6.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=1036520&r1=1036519&r2=1036520&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Thu Nov 18 16:30:32 2010
@@ -209,22 +209,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r991972
- Replace os.rename(src,dst) with shutil.move() while setting up authz files
- in the test suite.
- Notes:
- On most linux variants, os.rename(src,dst) will tolerate an existing
- dst, but Windows will not. The change to use os.rename() was made in
- the backport of r991534.
- Justification:
- With r991534 backported, we can no longer run the dav tests on Windows
- without this change.
- Branch:
- No branch is required, however r991972 was made in sandbox.py, which
- doesn't exist on 1.6.x. A file merge from sandbox.py to main.py on
- the 1.6.x branch will cleanly apply the one line change, i.e.:
- svn merge ^/subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py
- subversion\tests\cmdline\svntest\main.py -c991972
- Votes:
- +1: pburba, stsp, rhuijben
Modified: subversion/branches/1.6.x/subversion/tests/cmdline/svntest/main.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/tests/cmdline/svntest/main.py?rev=1036520&r1=1036519&r2=1036520&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/tests/cmdline/svntest/main.py
(original)
+++ subversion/branches/1.6.x/subversion/tests/cmdline/svntest/main.py Thu Nov
18 16:30:32 2010
@@ -1046,7 +1046,7 @@ class Sandbox:
self.authz_file = os.path.join(work_dir, "authz")
tmp_authz_file = os.path.join(work_dir, "authz-" + self.name)
open(tmp_authz_file, 'w').write("[/]\n* = rw\n")
- os.rename(tmp_authz_file, self.authz_file)
+ shutil.move(tmp_authz_file, self.authz_file)
# For svnserve tests we have a per-repository authz file, and it
# doesn't need to be there in order for things to work, so we don't
Propchange: subversion/branches/1.6.x/subversion/tests/cmdline/svntest/main.py
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Nov 18 16:30:32 2010
@@ -0,0 +1,104 @@
+/subversion/branches/1.5.x-r30215/subversion/tests/cmdline/svntest/main.py:870312
+/subversion/branches/1.6.x-1.6.8-serfassertion/subversion/tests/cmdline/svntest/main.py:900822-900868
+/subversion/branches/1.6.x-3242-partial-fixes/subversion/tests/cmdline/svntest/main.py:931279-932637
+/subversion/branches/1.6.x-UNC-paths/subversion/tests/cmdline/svntest/main.py:876471-876545
+/subversion/branches/1.6.x-dirent-basename/subversion/tests/cmdline/svntest/main.py:876130-876262
+/subversion/branches/1.6.x-future-proof/subversion/tests/cmdline/svntest/main.py:880259-884209
+/subversion/branches/1.6.x-issue-3242-partial/subversion/tests/cmdline/svntest/main.py:916088-923778
+/subversion/branches/1.6.x-issue3242-reintegrate/subversion/tests/cmdline/svntest/main.py:954549-1001798
+/subversion/branches/1.6.x-issue3303/subversion/tests/cmdline/svntest/main.py:950948-955336
+/subversion/branches/1.6.x-issue3390/subversion/tests/cmdline/svntest/main.py:907042-927863
+/subversion/branches/1.6.x-issue3432/subversion/tests/cmdline/svntest/main.py:878598-924025
+/subversion/branches/1.6.x-issue3443/subversion/tests/cmdline/svntest/main.py:878597-879480
+/subversion/branches/1.6.x-issue3469/subversion/tests/cmdline/svntest/main.py:945700-953293
+/subversion/branches/1.6.x-issue3506/subversion/tests/cmdline/svntest/main.py:934622-955678
+/subversion/branches/1.6.x-issue3506-init_once/subversion/tests/cmdline/svntest/main.py:935083-955686
+/subversion/branches/1.6.x-issue3519/subversion/tests/cmdline/svntest/main.py:880376-889934
+/subversion/branches/1.6.x-issue3573/subversion/tests/cmdline/svntest/main.py:906488-923765
+/subversion/branches/1.6.x-issue3605/subversion/tests/cmdline/svntest/main.py:923668-923887
+/subversion/branches/1.6.x-issue3623/subversion/tests/cmdline/svntest/main.py:952794-956049
+/subversion/branches/1.6.x-issue3646/subversion/tests/cmdline/svntest/main.py:957327-1002699
+/subversion/branches/1.6.x-issue3648/subversion/tests/cmdline/svntest/main.py:964172-1001805
+/subversion/branches/1.6.x-issue3651/subversion/tests/cmdline/svntest/main.py:952977-954985
+/subversion/branches/1.6.x-issue3654/subversion/tests/cmdline/svntest/main.py:953882-955338
+/subversion/branches/1.6.x-issue3683/subversion/tests/cmdline/svntest/main.py:965785-988062
+/subversion/branches/1.6.x-issue3700/subversion/tests/cmdline/svntest/main.py:991967-997279
+/subversion/branches/1.6.x-issue3727/subversion/tests/cmdline/svntest/main.py:1032967-1033213
+/subversion/branches/1.6.x-issue3745/subversion/tests/cmdline/svntest/main.py:1032257-1033223
+/subversion/branches/1.6.x-no-svn_uri/subversion/tests/cmdline/svntest/main.py:876360-876415
+/subversion/branches/1.6.x-no-wcng-check/subversion/tests/cmdline/svntest/main.py:1022248-1035322
+/subversion/branches/1.6.x-r1002094/subversion/tests/cmdline/svntest/main.py:1002741-1002773
+/subversion/branches/1.6.x-r1024269/subversion/tests/cmdline/svntest/main.py:1024274-1035798
+/subversion/branches/1.6.x-r36178/subversion/tests/cmdline/svntest/main.py:877876-877884
+/subversion/branches/1.6.x-r36252/subversion/tests/cmdline/svntest/main.py:876328-876788
+/subversion/branches/1.6.x-r37622/subversion/tests/cmdline/svntest/main.py:877699-877993
+/subversion/branches/1.6.x-r37627/subversion/tests/cmdline/svntest/main.py:877704-877928
+/subversion/branches/1.6.x-r37857/subversion/tests/cmdline/svntest/main.py:877932-877936
+/subversion/branches/1.6.x-r37953/subversion/tests/cmdline/svntest/main.py:879809-880071
+/subversion/branches/1.6.x-r37988/subversion/tests/cmdline/svntest/main.py:878063-878897
+/subversion/branches/1.6.x-r38000/subversion/tests/cmdline/svntest/main.py:879083-879767
+/subversion/branches/1.6.x-r38222/subversion/tests/cmdline/svntest/main.py:878299-878891
+/subversion/branches/1.6.x-r38572/subversion/tests/cmdline/svntest/main.py:878661-878666
+/subversion/branches/1.6.x-r38799/subversion/tests/cmdline/svntest/main.py:878880-878917
+/subversion/branches/1.6.x-r38836/subversion/tests/cmdline/svntest/main.py:878911-952818
+/subversion/branches/1.6.x-r38927/subversion/tests/cmdline/svntest/main.py:879002-879176
+/subversion/branches/1.6.x-r39019/subversion/tests/cmdline/svntest/main.py:879132-895676
+/subversion/branches/1.6.x-r39109/subversion/tests/cmdline/svntest/main.py:879131
+/subversion/branches/1.6.x-r39557/subversion/tests/cmdline/svntest/main.py:879668-879907
+/subversion/branches/1.6.x-r39887/subversion/tests/cmdline/svntest/main.py:880024-880066
+/subversion/branches/1.6.x-r40452/subversion/tests/cmdline/svntest/main.py:880530-890996
+/subversion/branches/1.6.x-r877814/subversion/tests/cmdline/svntest/main.py:1003097-1033216
+/subversion/branches/1.6.x-r879757/subversion/tests/cmdline/svntest/main.py:987687-999407
+/subversion/branches/1.6.x-r889840/subversion/tests/cmdline/svntest/main.py:889888-890974
+/subversion/branches/1.6.x-r891672/subversion/tests/cmdline/svntest/main.py:891676-923748
+/subversion/branches/1.6.x-r892050/subversion/tests/cmdline/svntest/main.py:923839-923856
+/subversion/branches/1.6.x-r896522/subversion/tests/cmdline/svntest/main.py:896528-897866
+/subversion/branches/1.6.x-r898963/subversion/tests/cmdline/svntest/main.py:899874-915098
+/subversion/branches/1.6.x-r905326/subversion/tests/cmdline/svntest/main.py:905545-923537
+/subversion/branches/1.6.x-r907644/subversion/tests/cmdline/svntest/main.py:1033292-1033692
+/subversion/branches/1.6.x-r923389/subversion/tests/cmdline/svntest/main.py:927445-929628
+/subversion/branches/1.6.x-r926151/subversion/tests/cmdline/svntest/main.py:927922-929631
+/subversion/branches/1.6.x-r933299/subversion/tests/cmdline/svntest/main.py:933310-934492
+/subversion/branches/1.6.x-r935631/subversion/tests/cmdline/svntest/main.py:952683-955333
+/subversion/branches/1.6.x-r935996/subversion/tests/cmdline/svntest/main.py:936212-952816
+/subversion/branches/1.6.x-r979045/subversion/tests/cmdline/svntest/main.py:987702-997248
+/subversion/branches/1.6.x-r980811/subversion/tests/cmdline/svntest/main.py:980813-987709
+/subversion/branches/1.6.x-r981921/subversion/tests/cmdline/svntest/main.py:981922-997253
+/subversion/branches/1.6.x-r991534/subversion/tests/cmdline/svntest/main.py:1003116-1033219
+/subversion/branches/1.6.x-r997457/subversion/tests/cmdline/svntest/main.py:997808-1002642
+/subversion/branches/1.6.x-wc-ng-check-override/subversion/tests/cmdline/svntest/main.py:910213-923776
+/subversion/branches/1.6.x-wc-ng-error/subversion/tests/cmdline/svntest/main.py:929379-929636
+/subversion/branches/bdb-reverse-deltas/subversion/tests/cmdline/svntest/main.py:872050-872529
+/subversion/branches/diff-callbacks3/subversion/tests/cmdline/svntest/main.py:870059-870761
+/subversion/branches/dont-save-plaintext-passwords-by-default/subversion/tests/cmdline/svntest/main.py:870728-871118
+/subversion/branches/double-delete/subversion/tests/cmdline/svntest/main.py:870511-872970
+/subversion/branches/file-externals/subversion/tests/cmdline/svntest/main.py:871779-873302
+/subversion/branches/fs-rep-sharing/subversion/tests/cmdline/svntest/main.py:869036-873803
+/subversion/branches/fsfs-pack/subversion/tests/cmdline/svntest/main.py:873717-874575
+/subversion/branches/gnome-keyring/subversion/tests/cmdline/svntest/main.py:870558-871410
+/subversion/branches/http-protocol-v2/subversion/tests/cmdline/svntest/main.py:875632
+/subversion/branches/in-memory-cache/subversion/tests/cmdline/svntest/main.py:869829-871452
+/subversion/branches/issue-2843-dev/subversion/tests/cmdline/svntest/main.py:871432-874179
+/subversion/branches/issue-3000/subversion/tests/cmdline/svntest/main.py:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/svntest/main.py:873375-874084
+/subversion/branches/issue-3148-dev/subversion/tests/cmdline/svntest/main.py:875193-875204
+/subversion/branches/issue-3220-dev/subversion/tests/cmdline/svntest/main.py:872210-872226
+/subversion/branches/issue-3242-dev/subversion/tests/cmdline/svntest/main.py:879762,880472,880579
+/subversion/branches/issue-3334-dirs/subversion/tests/cmdline/svntest/main.py:875156-875867
+/subversion/branches/kwallet/subversion/tests/cmdline/svntest/main.py:870785-871314
+/subversion/branches/log-g-performance/subversion/tests/cmdline/svntest/main.py:870941-871032
+/subversion/branches/merge-skips-obstructions/subversion/tests/cmdline/svntest/main.py:874525-874615
+/subversion/branches/performance/subversion/tests/cmdline/svntest/main.py:982355,983766,984927
+/subversion/branches/reintegrate-improvements/subversion/tests/cmdline/svntest/main.py:873853-874164
+/subversion/branches/subtree-mergeinfo/subversion/tests/cmdline/svntest/main.py:876855
+/subversion/branches/svn-mergeinfo-enhancements/subversion/tests/cmdline/svntest/main.py:870119-870195,870197-870288
+/subversion/branches/svnpatch-diff/subversion/tests/cmdline/svntest/main.py:871905,871986
+/subversion/branches/svnserve-logging/subversion/tests/cmdline/svntest/main.py:869828-870893
+/subversion/branches/tc-issue-3334/subversion/tests/cmdline/svntest/main.py:874697-874773
+/subversion/branches/tc-merge-notify/subversion/tests/cmdline/svntest/main.py:874017-874062
+/subversion/branches/tc-resolve/subversion/tests/cmdline/svntest/main.py:874191-874239
+/subversion/branches/tc_url_rev/subversion/tests/cmdline/svntest/main.py:874351-874483
+/subversion/branches/tree-conflicts/subversion/tests/cmdline/svntest/main.py:868291-873154
+/subversion/branches/tree-conflicts-notify/subversion/tests/cmdline/svntest/main.py:873926-874008
+/subversion/trunk/subversion/tests/cmdline/svntest/main.py:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614-876615,876628,876633,876641,876645,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319
,877407,877437,877441-877442,877453,877459,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,8
79201,879271,879293,879357,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880082,880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,904301,904394,904594,905303,905326,906256,906305,906587,907644,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,939375-939376,944635,945350,946767,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,962377-962378,964167,964349,964767,965405,965469,965508,979045,979429,980811,981449,981921,984565,984928,984931,991534,996884,997026,997070,997457,997466,997471,997474,1000038,1000060,1000607,1000612,1001009,1002094,1005446,102
2675,1024269,1027957,1028108,1031165,1031186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745
+/subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py:991972
