{"thread":{"id":"20121","subject":"[RFC PATCH] cvsexportcommit: reorder tests to quiet intermittent failure","startedAt":"2009-07-15T14:34:24Z","lastAt":"2009-07-15T14:34:24Z","messageCount":1,"participants":["Mike Ralphson"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"118028","messageId":"1247668464-20813-1-git-send-email-mike@abacus.co.uk","threadId":"20121","inReplyTo":null,"subject":"[RFC PATCH] cvsexportcommit: reorder tests to quiet intermittent failure","fromName":"Mike Ralphson","fromEmail":"mike@abacus.co.uk","sentAt":"2009-07-15T14:34:24Z","receivedAt":"2009-07-15T14:34:24Z","isPatch":true,"sender":{"key":"mike@abacus.co.uk","avatar":"https://gravatar.com/avatar/717865f1e9a9197ec082b9f6a12e048210a9da06878e47f165b470c43a9e9175?d=mp&s=160"},"body":"Reorder tests introduced in fef3a7cc and 54d5cc0e so an intermittent but\nunimportant failure on the CVS side related to the former does not interfere\nwith what is actually being tested.\n\nSigned-off-by: Mike Ralphson <mike@abacus.co.uk>\n---\n\nBackground is at http://thread.gmane.org/gmane.comp.version-control.git/120241/focus=121339\nJust chucking this out as a possibility so 1.6.4 doesn't ship with a test\nwhich fails unpredictably.\n\n t/t9200-git-cvsexportcommit.sh |   41 +++++++++++++++++++++------------------\n 1 files changed, 22 insertions(+), 19 deletions(-)\n\ndiff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh\nindex ef1f8d2..fc3795d 100755\n--- a/t/t9200-git-cvsexportcommit.sh\n+++ b/t/t9200-git-cvsexportcommit.sh\n@@ -288,6 +288,27 @@ test_expect_success 'check files before directories' '\n \n '\n \n+test_expect_success 're-commit a removed filename which remains in CVS attic' '\n+\n+    (cd \"$CVSWORK\" &&\n+     echo >attic_gremlin &&\n+     cvs -Q add attic_gremlin &&\n+     cvs -Q ci -m \"added attic_gremlin\" &&\n+     rm attic_gremlin &&\n+     cvs -Q rm attic_gremlin &&\n+     cvs -Q ci -m \"removed attic_gremlin\") &&\n+\n+    echo > attic_gremlin &&\n+    git add attic_gremlin &&\n+    git commit -m \"Added attic_gremlin\" &&\n+\tgit cvsexportcommit -w \"$CVSWORK\" -c HEAD &&\n+    (cd \"$CVSWORK\"; cvs -Q update -d) &&\n+    test -f \"$CVSWORK/attic_gremlin\"\n+'\n+\n+# the state of the CVS sandbox may be indeterminate for ' space'\n+# after this test on some platforms / with some versions of CVS\n+# consider adding new tests above this point\n test_expect_success 'commit a file with leading spaces in the name' '\n \n \techo space > \" space\" &&\n@@ -295,7 +316,7 @@ test_expect_success 'commit a file with leading spaces in the name' '\n \tgit commit -m \"Add a file with a leading space\" &&\n \tid=$(git rev-parse HEAD) &&\n \tgit cvsexportcommit -w \"$CVSWORK\" -c $id &&\n-\tcheck_entries \"$CVSWORK\" \" space/1.1/|DS/1.1/|release-notes/1.2/\" &&\n+\tcheck_entries \"$CVSWORK\" \" space/1.1/|DS/1.1/|attic_gremlin/1.3/|release-notes/1.2/\" &&\n \ttest_cmp \"$CVSWORK/ space\" \" space\"\n \n '\n@@ -317,22 +338,4 @@ test_expect_success 'use the same checkout for Git and CVS' '\n \n '\n \n-test_expect_success 're-commit a removed filename which remains in CVS attic' '\n-\n-    (cd \"$CVSWORK\" &&\n-     echo >attic_gremlin &&\n-     cvs -Q add attic_gremlin &&\n-     cvs -Q ci -m \"added attic_gremlin\" &&\n-     rm attic_gremlin &&\n-     cvs -Q rm attic_gremlin &&\n-     cvs -Q ci -m \"removed attic_gremlin\") &&\n-\n-    echo > attic_gremlin &&\n-    git add attic_gremlin &&\n-    git commit -m \"Added attic_gremlin\" &&\n-\tgit cvsexportcommit -w \"$CVSWORK\" -c HEAD &&\n-    (cd \"$CVSWORK\"; cvs -Q update -d) &&\n-    test -f \"$CVSWORK/attic_gremlin\"\n-'\n-\n test_done\n-- \n1.6.3.1.54.g99dd\n"}]}