You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/10/12 16:05:04 UTC
svn commit: r1182378 - in /subversion/branches/1.7.x: STATUS
subversion/tests/cmdline/basic_tests.py
Author: hwright
Date: Wed Oct 12 14:05:03 2011
New Revision: 1182378
URL: http://svn.apache.org/viewvc?rev=1182378&view=rev
Log:
Cherry-pick r1174111 from trunk, as explained below:
* r1174111
Use the correct function to copy repositories in the testsuite.
Justification:
Prevent occassional test failure.
Votes:
+1: philip
+0: pburba (Ideally this would be done as a subtree merge targeting
basic_tests.py, as danielsh points out in
http://svn.haxx.se/dev/archive-2011-09/0482.shtml. I'm +1
if the backport is done that way).
+1: danielsh, rhuijben (conditioned upon the backport done as per Paul's
comment)
Modified:
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/tests/cmdline/basic_tests.py (contents, props changed)
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1182378&r1=1182377&r2=1182378&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 12 14:05:03 2011
@@ -116,16 +116,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1174111
- Use the correct function to copy repositories in the testsuite.
- Justification:
- Prevent occassional test failure.
- Votes:
- +1: philip
- +0: pburba (Ideally this would be done as a subtree merge targeting
- basic_tests.py, as danielsh points out in
- http://svn.haxx.se/dev/archive-2011-09/0482.shtml. I'm +1
- if the backport is done that way).
- +1: danielsh, rhuijben (conditioned upon the backport done as per Paul's
- comment)
Modified: subversion/branches/1.7.x/subversion/tests/cmdline/basic_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/cmdline/basic_tests.py?rev=1182378&r1=1182377&r2=1182378&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/branches/1.7.x/subversion/tests/cmdline/basic_tests.py Wed Oct 12 14:05:03 2011
@@ -2623,7 +2623,7 @@ def basic_relocate(sbox):
repo_dir = sbox.repo_dir
repo_url = sbox.repo_url
other_repo_dir, other_repo_url = sbox.add_repo_path('other')
- shutil.copytree(repo_dir, other_repo_dir)
+ svntest.main.copy_repos(repo_dir, other_repo_dir, 1, 0)
def _verify_url(wc_path, url):
name = os.path.basename(wc_path)
Propchange: subversion/branches/1.7.x/subversion/tests/cmdline/basic_tests.py
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Oct 12 14:05:03 2011
@@ -0,0 +1,67 @@
+/subversion/branches/1.5.x-r30215/subversion/tests/cmdline/basic_tests.py:870312
+/subversion/branches/1.7.x-JavaHL-pools/subversion/tests/cmdline/basic_tests.py:1158684-1158722
+/subversion/branches/1.7.x-issue3888/subversion/tests/cmdline/basic_tests.py:1148937-1149162
+/subversion/branches/1.7.x-issue3975/subversion/tests/cmdline/basic_tests.py:1160761-1161546
+/subversion/branches/1.7.x-issue3976/subversion/tests/cmdline/basic_tests.py:1161731-1165397
+/subversion/branches/1.7.x-issue4k/subversion/tests/cmdline/basic_tests.py:1166502-1167193
+/subversion/branches/1.7.x-neon-default/subversion/tests/cmdline/basic_tests.py:1148803-1158680
+/subversion/branches/1.7.x-r1152189/subversion/tests/cmdline/basic_tests.py:1152759-1154249
+/subversion/branches/1.7.x-r1155160/subversion/tests/cmdline/basic_tests.py:1158704-1159223
+/subversion/branches/1.7.x-r1159093/subversion/tests/cmdline/basic_tests.py:1159097-1159230
+/subversion/branches/1.7.x-r1163557/subversion/tests/cmdline/basic_tests.py:1163574-1170648
+/subversion/branches/1.7.x-r1173425/subversion/tests/cmdline/basic_tests.py:1173429-1176454
+/subversion/branches/atomic-revprop/subversion/tests/cmdline/basic_tests.py:965046-1000689
+/subversion/branches/bdb-reverse-deltas/subversion/tests/cmdline/basic_tests.py:872050-872529
+/subversion/branches/diff-callbacks3/subversion/tests/cmdline/basic_tests.py:870059-870761
+/subversion/branches/diff-optimizations/subversion/tests/cmdline/basic_tests.py:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/subversion/tests/cmdline/basic_tests.py:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/subversion/tests/cmdline/basic_tests.py:870728-871118
+/subversion/branches/double-delete/subversion/tests/cmdline/basic_tests.py:870511-872970
+/subversion/branches/explore-wc/subversion/tests/cmdline/basic_tests.py:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
+/subversion/branches/file-externals/subversion/tests/cmdline/basic_tests.py:871779-873302
+/subversion/branches/fs-rep-sharing/subversion/tests/cmdline/basic_tests.py:869036-873803
+/subversion/branches/fsfs-pack/subversion/tests/cmdline/basic_tests.py:873717-874575
+/subversion/branches/gnome-keyring/subversion/tests/cmdline/basic_tests.py:870558-871410
+/subversion/branches/http-protocol-v2/subversion/tests/cmdline/basic_tests.py:874395-876041
+/subversion/branches/in-memory-cache/subversion/tests/cmdline/basic_tests.py:869829-871452
+/subversion/branches/integrate-cache-item-serialization/subversion/tests/cmdline/basic_tests.py:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/subversion/tests/cmdline/basic_tests.py:998649-998852
+/subversion/branches/integrate-compression-level/subversion/tests/cmdline/basic_tests.py:1068651-1072287
+/subversion/branches/integrate-io-improvements/subversion/tests/cmdline/basic_tests.py:1068684-1072297
+/subversion/branches/integrate-is-cachable/subversion/tests/cmdline/basic_tests.py:1072568-1074082
+/subversion/branches/integrate-partial-getter/subversion/tests/cmdline/basic_tests.py:1072558-1076552
+/subversion/branches/integrate-readline-speedup/subversion/tests/cmdline/basic_tests.py:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/subversion/tests/cmdline/basic_tests.py:1068695-1072516
+/subversion/branches/integrate-txdelta-caching/subversion/tests/cmdline/basic_tests.py:1072541-1078213
+/subversion/branches/issue-2779-dev/subversion/tests/cmdline/basic_tests.py:965496-984198
+/subversion/branches/issue-2843-dev/subversion/tests/cmdline/basic_tests.py:871432-874179
+/subversion/branches/issue-3000/subversion/tests/cmdline/basic_tests.py:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/basic_tests.py:873375-874084
+/subversion/branches/issue-3148-dev/subversion/tests/cmdline/basic_tests.py:875193-875204
+/subversion/branches/issue-3220-dev/subversion/tests/cmdline/basic_tests.py:872210-872226
+/subversion/branches/issue-3242-dev/subversion/tests/cmdline/basic_tests.py:879653-896436
+/subversion/branches/issue-3334-dirs/subversion/tests/cmdline/basic_tests.py:875156-875867
+/subversion/branches/issue-3975/subversion/tests/cmdline/basic_tests.py:1152931-1160746
+/subversion/branches/kwallet/subversion/tests/cmdline/basic_tests.py:870785-871314
+/subversion/branches/log-g-performance/subversion/tests/cmdline/basic_tests.py:870941-871032
+/subversion/branches/merge-skips-obstructions/subversion/tests/cmdline/basic_tests.py:874525-874615
+/subversion/branches/nfc-nfd-aware-client/subversion/tests/cmdline/basic_tests.py:870276,870376
+/subversion/branches/performance/subversion/tests/cmdline/basic_tests.py:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985695,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,992899,992904,992911,993127,993141,994956,995478,995507,995603,998012,998858,999098,1001413,1001417,1004291,1022668,1022670,1022676,1022715,1022719,1025660,1025672,1027193,1027203,1027206,1027214,1027227,1028077,1028092,1028094,1028104,1028107,1028111,1028354,1029038,1029042-1029043,1029054-1029055,1029062-1029063,1029078,1029080,1029090,1029092-1029093,1029111,1029151,1029158,1029229-1029230,1029232,1029335-
1029336,1029339-1029340,1029342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/py-tests-as-modules/subversion/tests/cmdline/basic_tests.py:956579-1033052
+/subversion/branches/ra_serf-digest-authn/subversion/tests/cmdline/basic_tests.py:875693-876404
+/subversion/branches/reintegrate-improvements/subversion/tests/cmdline/basic_tests.py:873853-874164
+/subversion/branches/revprop-packing/subversion/tests/cmdline/basic_tests.py:1143907,1143971,1143997,1144017,1144499,1144568
+/subversion/branches/subtree-mergeinfo/subversion/tests/cmdline/basic_tests.py:876734-878766
+/subversion/branches/svn-mergeinfo-enhancements/subversion/tests/cmdline/basic_tests.py:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/subversion/tests/cmdline/basic_tests.py:918519-934609
+/subversion/branches/svnpatch-diff/subversion/tests/cmdline/basic_tests.py:865738-876477
+/subversion/branches/svnraisetc/subversion/tests/cmdline/basic_tests.py:874709-875149
+/subversion/branches/svnserve-logging/subversion/tests/cmdline/basic_tests.py:869828-870893
+/subversion/branches/tc-issue-3334/subversion/tests/cmdline/basic_tests.py:874697-874773
+/subversion/branches/tc-merge-notify/subversion/tests/cmdline/basic_tests.py:874017-874062
+/subversion/branches/tc-resolve/subversion/tests/cmdline/basic_tests.py:874191-874239
+/subversion/branches/tc_url_rev/subversion/tests/cmdline/basic_tests.py:874351-874483
+/subversion/branches/tree-conflicts/subversion/tests/cmdline/basic_tests.py:868291-873154
+/subversion/branches/tree-conflicts-notify/subversion/tests/cmdline/basic_tests.py:873926-874008
+/subversion/branches/uris-as-urls/subversion/tests/cmdline/basic_tests.py:1060426-1064427
+/subversion/trunk/subversion/tests/cmdline/basic_tests.py:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,115
6312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174111,1174652,1174761,1174797-1174798,1174806,1175888,1176949,1177001,1177492,1179680,1179767,1181155,1181666