{"thread":{"id":"24328","subject":"t9118 broken in current master, 9918285, git/git/v1.7.2-rc2","startedAt":"2010-07-08T01:49:41Z","lastAt":"2010-07-08T20:59:56Z","messageCount":8,"participants":["A Large Angry SCM","Brian Gernhardt","Jonathan Nieder","Eric Wong"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"145075","messageId":"4C352EB5.5020005@gmail.com","threadId":"24328","inReplyTo":null,"subject":"t9118 broken in current master, 9918285, git/git/v1.7.2-rc2","fromName":"A Large Angry SCM","fromEmail":"gitzilla@gmail.com","sentAt":"2010-07-08T01:49:41Z","receivedAt":"2010-07-08T01:49:41Z","isPatch":false,"sender":{"key":"gitzilla@gmail.com","avatar":"https://gravatar.com/avatar/354625c442439908ff3dd99757dee330e29e9df7847472384faf7a00add247fb?d=mp&s=160"},"body":"I've been busy with other projects and haven't attempted a full make & \nmake test since f526d12, which did pass all the tests. Since the test \nname implies svn/git-svn breakage, I hoping the git-svn experts can find \nthe problem.\n\nThis was on an amd64 Debian Squeeze system, up to date as of about 13:00 \nEDT today.\n\n\n*** t9118-git-svn-funky-branch-names.sh ***\nok 1 - setup svnrepo\nnot ok - 2 test clone with funky branch names\n#\n#               git svn clone -s \"$svnrepo/pr ject\" project &&\n#               cd project &&\n#                       git rev-parse \"refs/remotes/fun%20plugin\" &&\n#                       git rev-parse \"refs/remotes/more%20fun%20plugin!\" &&\n#                       git rev-parse \"refs/remotes/$scary_ref\" &&\n#                       git rev-parse \"refs/remotes/%2Eleading_dot\" &&\n#                       git rev-parse \"refs/remotes/trailing_dot%2E\" &&\n#                       git rev-parse \n\"refs/remotes/trailing_dotlock%2Elock\" &&\n#                       git rev-parse \"refs/remotes/not-a%40{0}reflog\" &&\n#               cd ..\n#\nnot ok - 3 test dcommit to funky branch\n#\n#               cd project &&\n#               git reset --hard 'refs/remotes/more%20fun%20plugin!' &&\n#               echo hello >> foo &&\n#               git commit -m 'hello' -- foo &&\n#               git svn dcommit &&\n#               cd ..\n#\nnot ok - 4 test dcommit to scary branch\n#\n#               cd project &&\n#               git reset --hard \"refs/remotes/$scary_ref\" &&\n#               echo urls are scary >> foo &&\n#               git commit -m \"eep\" -- foo &&\n#               git svn dcommit &&\n#               cd ..\n#\nnot ok - 5 test dcommit to trailing_dotlock branch\n#\n#               cd project &&\n#               git reset --hard \"refs/remotes/trailing_dotlock%2Elock\" &&\n#               echo who names branches like this anyway? >> foo &&\n#               git commit -m \"bar\" -- foo &&\n#               git svn dcommit &&\n#               cd ..\n#\n# failed 4 among 5 test(s)\n"},{"id":"145082","messageId":"68AF81DF-7434-4493-8FBF-6DDEF27BFAB1@silverinsanity.com","threadId":"24328","inReplyTo":"4C352EB5.5020005@gmail.com","subject":"Re: t9118 broken in current master, 9918285, git/git/v1.7.2-rc2","fromName":"Brian Gernhardt","fromEmail":"benji@silverinsanity.com","sentAt":"2010-07-08T03:15:29Z","receivedAt":"2010-07-08T03:15:29Z","isPatch":false,"sender":{"key":"benji@silverinsanity.com","avatar":"https://gravatar.com/avatar/e06c101dbc25c68114d859b4a9ec7cf8a2c52fd2b0270ef0eac0e2e63ff22311?d=mp&s=160"},"body":"\nOn Jul 7, 2010, at 9:49 PM, A Large Angry SCM wrote:\n\n> I've been busy with other projects and haven't attempted a full make & make test since f526d12, which did pass all the tests. Since the test name implies svn/git-svn breakage, I hoping the git-svn experts can find the problem.\n\nI'm getting intermittent errors in t9115 instead.  Running the full test suite with prove[1] gives:\n\n./t9115-git-svn-dcommit-funky-renames.sh ............. Dubious, test returned 1 (wstat 256, 0x100)\nFailed 9/10 subtests \n\nRunning the test separately gives:\n\n $ ./t9115-git-svn-dcommit-funky-renames.sh \nok 1 - load repository with strange names\nok 2 - init and fetch repository\nok 3 - create file in existing ugly and empty dir\nok 4 - rename ugly file\nok 5 - rename pretty file\nok 6 - rename pretty file into ugly one\nok 7 - add a file with plus signs\nok 8 - clone the repository to test rebase\nok 9 - make a commit to test rebase\nok 10 - git svn rebase works inside a fresh-cloned repository\n# passed all 10 test(s)\n1..10\n\nThese may be unrelated, but thought I'd bring it up.\n\n$ git describe HEAD\nv1.7.2-rc2-191-gd2de19a\n\n[1] prove -j 3 --state=hot,fresh,slow,save ./t[0-9]*.sh"},{"id":"145083","messageId":"8E6B46F9-41B7-4902-8910-A13144005C12@silverinsanity.com","threadId":"24328","inReplyTo":"68AF81DF-7434-4493-8FBF-6DDEF27BFAB1@silverinsanity.com","subject":"Re: t9118 broken in current master, 9918285, git/git/v1.7.2-rc2","fromName":"Brian Gernhardt","fromEmail":"benji@silverinsanity.com","sentAt":"2010-07-08T03:42:53Z","receivedAt":"2010-07-08T03:42:53Z","isPatch":false,"sender":{"key":"benji@silverinsanity.com","avatar":"https://gravatar.com/avatar/e06c101dbc25c68114d859b4a9ec7cf8a2c52fd2b0270ef0eac0e2e63ff22311?d=mp&s=160"},"body":"\nOn Jul 7, 2010, at 11:15 PM, Brian Gernhardt wrote:\n\n> I'm getting intermittent errors in t9115 instead.\n\nOkay, but intermittent I mean that I had SVN_HTTPD_PORT defined in one place and not the other.  It actually caused failures in tests 9115, 9120, 9142.  Running tests in parallel appears to break the SVN httpd setup and teardown.\n\n~~ Brian"},{"id":"145125","messageId":"20100708133602.GA1882@burratino","threadId":"24328","inReplyTo":"4C352EB5.5020005@gmail.com","subject":"[PATCH] t9118 (git-svn): prevent early failure from taking down later tests","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-07-08T13:36:02Z","receivedAt":"2010-07-08T13:36:02Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"When test #2 fails, the cwd is project/, causing all the\nremaining tests in the same script to get confused and fail.\n\nSo in the spirit of v1.7.1.1~53^2~10 (t5550-http-fetch: Use subshell\nfor repository operations, 2010-04-17), use a subshell for svn\nworking copy operations.  This way, the cwd will reliably return\nto the top of the trash directory and later tests can still be run\nwhen a command has failed.\n\nReported-by: A Large Angry SCM <gitzilla@gmail.com>\nSigned-off-by: Jonathan Nieder <jrnieder@gmail.com>\n---\nA Large Angry SCM wrote:\n\n> *** t9118-git-svn-funky-branch-names.sh ***\n> ok 1 - setup svnrepo\n> not ok - 2 test clone with funky branch names\n\nRelates to an svn change from some point between 1.5.1 and 1.6.12.\nNot solved yet.  See\n<http://thread.gmane.org/gmane.comp.version-control.git/146498/focus=150549>.\n\n> not ok - 3 test dcommit to funky branch\n> not ok - 4 test dcommit to scary branch\n> not ok - 5 test dcommit to trailing_dotlock branch\n\nCollateral damage.  How about this patch?\n\n t/t9118-git-svn-funky-branch-names.sh |   46 ++++++++++++++++++---------------\n 1 files changed, 25 insertions(+), 21 deletions(-)\n\ndiff --git a/t/t9118-git-svn-funky-branch-names.sh b/t/t9118-git-svn-funky-branch-names.sh\nindex 7d7acc3..5dbea59 100755\n--- a/t/t9118-git-svn-funky-branch-names.sh\n+++ b/t/t9118-git-svn-funky-branch-names.sh\n@@ -34,42 +34,46 @@ test_expect_success 'setup svnrepo' '\n \n test_expect_success 'test clone with funky branch names' '\n \tgit svn clone -s \"$svnrepo/pr ject\" project &&\n-\tcd project &&\n+\t(\n+\t\tcd project &&\n \t\tgit rev-parse \"refs/remotes/fun%20plugin\" &&\n \t\tgit rev-parse \"refs/remotes/more%20fun%20plugin!\" &&\n \t\tgit rev-parse \"refs/remotes/$scary_ref\" &&\n \t\tgit rev-parse \"refs/remotes/%2Eleading_dot\" &&\n \t\tgit rev-parse \"refs/remotes/trailing_dot%2E\" &&\n \t\tgit rev-parse \"refs/remotes/trailing_dotlock%2Elock\" &&\n-\t\tgit rev-parse \"refs/remotes/not-a%40{0}reflog\" &&\n-\tcd ..\n+\t\tgit rev-parse \"refs/remotes/not-a%40{0}reflog\"\n+\t)\n \t'\n \n test_expect_success 'test dcommit to funky branch' \"\n-\tcd project &&\n-\tgit reset --hard 'refs/remotes/more%20fun%20plugin!' &&\n-\techo hello >> foo &&\n-\tgit commit -m 'hello' -- foo &&\n-\tgit svn dcommit &&\n-\tcd ..\n+\t(\n+\t\tcd project &&\n+\t\tgit reset --hard 'refs/remotes/more%20fun%20plugin!' &&\n+\t\techo hello >> foo &&\n+\t\tgit commit -m 'hello' -- foo &&\n+\t\tgit svn dcommit\n+\t)\n \t\"\n \n test_expect_success 'test dcommit to scary branch' '\n-\tcd project &&\n-\tgit reset --hard \"refs/remotes/$scary_ref\" &&\n-\techo urls are scary >> foo &&\n-\tgit commit -m \"eep\" -- foo &&\n-\tgit svn dcommit &&\n-\tcd ..\n+\t(\n+\t\tcd project &&\n+\t\tgit reset --hard \"refs/remotes/$scary_ref\" &&\n+\t\techo urls are scary >> foo &&\n+\t\tgit commit -m \"eep\" -- foo &&\n+\t\tgit svn dcommit\n+\t)\n \t'\n \n test_expect_success 'test dcommit to trailing_dotlock branch' '\n-\tcd project &&\n-\tgit reset --hard \"refs/remotes/trailing_dotlock%2Elock\" &&\n-\techo who names branches like this anyway? >> foo &&\n-\tgit commit -m \"bar\" -- foo &&\n-\tgit svn dcommit &&\n-\tcd ..\n+\t(\n+\t\tcd project &&\n+\t\tgit reset --hard \"refs/remotes/trailing_dotlock%2Elock\" &&\n+\t\techo who names branches like this anyway? >> foo &&\n+\t\tgit commit -m \"bar\" -- foo &&\n+\t\tgit svn dcommit\n+\t)\n \t'\n \n stop_httpd\n-- \n1.7.2.rc1.527.gff41c3.dirty\n"},{"id":"145127","messageId":"4C35DB6B.4090002@gmail.com","threadId":"24328","inReplyTo":"8E6B46F9-41B7-4902-8910-A13144005C12@silverinsanity.com","subject":"Re: t9118 broken in current master, 9918285, git/git/v1.7.2-rc2","fromName":"A Large Angry SCM","fromEmail":"gitzilla@gmail.com","sentAt":"2010-07-08T14:06:35Z","receivedAt":"2010-07-08T14:06:35Z","isPatch":false,"sender":{"key":"gitzilla@gmail.com","avatar":"https://gravatar.com/avatar/354625c442439908ff3dd99757dee330e29e9df7847472384faf7a00add247fb?d=mp&s=160"},"body":"On 07/07/2010 11:42 PM, Brian Gernhardt wrote:\n>\n> On Jul 7, 2010, at 11:15 PM, Brian Gernhardt wrote:\n>\n>> I'm getting intermittent errors in t9115 instead.\n>\n> Okay, but intermittent I mean that I had SVN_HTTPD_PORT defined in one place and not the other.  It actually caused failures in tests 9115, 9120, 9142.  Running tests in parallel appears to break the SVN httpd setup and teardown.\n\nIf the test suite now fails if the tests are run in parallel then that's \na new breakage. As of f526d12 \"make -j4 test\" was still passed on my \nsystem. The cut-n-paste in the email I sent last night was from a run \nwithout the -j4 make option so the problem is not just running the tests \nin parallel.\n"},{"id":"145129","messageId":"4C35E230.8020202@gmail.com","threadId":"24328","inReplyTo":"20100708133602.GA1882@burratino","subject":"Re: [PATCH] t9118 (git-svn): prevent early failure from taking down later tests","fromName":"A Large Angry SCM","fromEmail":"gitzilla@gmail.com","sentAt":"2010-07-08T14:35:28Z","receivedAt":"2010-07-08T14:35:28Z","isPatch":true,"sender":{"key":"gitzilla@gmail.com","avatar":"https://gravatar.com/avatar/354625c442439908ff3dd99757dee330e29e9df7847472384faf7a00add247fb?d=mp&s=160"},"body":"On 07/08/2010 09:36 AM, Jonathan Nieder wrote:\n> When test #2 fails, the cwd is project/, causing all the\n> remaining tests in the same script to get confused and fail.\n>\n> So in the spirit of v1.7.1.1~53^2~10 (t5550-http-fetch: Use subshell\n> for repository operations, 2010-04-17), use a subshell for svn\n> working copy operations.  This way, the cwd will reliably return\n> to the top of the trash directory and later tests can still be run\n> when a command has failed.\n>\n> Reported-by: A Large Angry SCM<gitzilla@gmail.com>\n> Signed-off-by: Jonathan Nieder<jrnieder@gmail.com>\n> ---\n> A Large Angry SCM wrote:\n>\n>> *** t9118-git-svn-funky-branch-names.sh ***\n>> ok 1 - setup svnrepo\n>> not ok - 2 test clone with funky branch names\n>\n> Relates to an svn change from some point between 1.5.1 and 1.6.12.\n> Not solved yet.  See\n> <http://thread.gmane.org/gmane.comp.version-control.git/146498/focus=150549>.\n>\n>> not ok - 3 test dcommit to funky branch\n>> not ok - 4 test dcommit to scary branch\n>> not ok - 5 test dcommit to trailing_dotlock branch\n>\n> Collateral damage.  How about this patch?\n>\n>   t/t9118-git-svn-funky-branch-names.sh |   46 ++++++++++++++++++---------------\n>   1 files changed, 25 insertions(+), 21 deletions(-)\n>\n> diff --git a/t/t9118-git-svn-funky-branch-names.sh b/t/t9118-git-svn-funky-branch-names.sh\n> index 7d7acc3..5dbea59 100755\n[...]\n\n\nWith this patch, test 2 still fails but the others now pass.\n\n\n*** t9118-git-svn-funky-branch-names.sh ***\nok 1 - setup svnrepo\nnot ok - 2 test clone with funky branch names\n#\n#               git svn clone -s \"$svnrepo/pr ject\" project &&\n#               (\n#                       cd project &&\n#                       git rev-parse \"refs/remotes/fun%20plugin\" &&\n#                       git rev-parse \"refs/remotes/more%20fun%20plugin!\" &&\n#                       git rev-parse \"refs/remotes/$scary_ref\" &&\n#                       git rev-parse \"refs/remotes/%2Eleading_dot\" &&\n#                       git rev-parse \"refs/remotes/trailing_dot%2E\" &&\n#                       git rev-parse \n\"refs/remotes/trailing_dotlock%2Elock\" &&\n#                       git rev-parse \"refs/remotes/not-a%40{0}reflog\"\n#               )\n#\nok 3 - test dcommit to funky branch\nok 4 - test dcommit to scary branch\nok 5 - test dcommit to trailing_dotlock branch\n# failed 1 among 5 test(s)\n1..5\n"},{"id":"145137","messageId":"20100708164835.GA17870@burratino","threadId":"24328","inReplyTo":"4C35E230.8020202@gmail.com","subject":"Re: [PATCH] t9118 (git-svn): prevent early failure from taking down later tests","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-07-08T16:48:35Z","receivedAt":"2010-07-08T16:48:35Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"A Large Angry SCM wrote:\n\n> With this patch, test 2 still fails but the others now pass.\n\nGood, it works as designed then.  Thanks for checking.\n"},{"id":"145163","messageId":"20100708205956.GA21961@dcvr.yhbt.net","threadId":"24328","inReplyTo":"20100708133602.GA1882@burratino","subject":"Re: [PATCH] t9118 (git-svn): prevent early failure from taking down later tests","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2010-07-08T20:59:56Z","receivedAt":"2010-07-08T20:59:56Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Jonathan Nieder <jrnieder@gmail.com> wrote:\n> When test #2 fails, the cwd is project/, causing all the\n> remaining tests in the same script to get confused and fail.\n> \n> So in the spirit of v1.7.1.1~53^2~10 (t5550-http-fetch: Use subshell\n> for repository operations, 2010-04-17), use a subshell for svn\n> working copy operations.  This way, the cwd will reliably return\n> to the top of the trash directory and later tests can still be run\n> when a command has failed.\n> \n> Reported-by: A Large Angry SCM <gitzilla@gmail.com>\n> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>\n> ---\n\nThanks.\n\nAcked and pushed out to git://git.bogomips.org/git-svn\nfor Junio to pull:\n\nJonathan Nieder (1):\n      t9118 (git-svn): prevent early failure from taking down later tests\n\nMichael J Gruber (1):\n      t9118: avoid PEG revision identifier in tests\n\n-- \nEric Wong\n"}]}