This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
The following commit(s) were added to refs/heads/master by this push:
new f5d8bb4fa Some Git tests hang when gpg sign activated globally and
activte TCK testing for CI (#186)
f5d8bb4fa is described below
commit f5d8bb4fa69b0338377fd96a6cd3ec2499ad688c
Author: Olivier Lamy <[email protected]>
AuthorDate: Tue Oct 3 14:22:59 2023 +1000
Some Git tests hang when gpg sign activated globally and activte TCK
testing for CI (#186)
* Some Git tests hang when gpg sign activated globally
Signed-off-by: Olivier Lamy <[email protected]>
* activate some TCK
Signed-off-by: Olivier Lamy <[email protected]>
* run tck git
Signed-off-by: Olivier Lamy <[email protected]>
* run tck-svn on Jenkins as well
Signed-off-by: Olivier Lamy <[email protected]>
---------
Signed-off-by: Olivier Lamy <[email protected]>
---
.github/workflows/maven-verify.yml | 1 +
Jenkinsfile | 2 +-
.../java/org/apache/maven/scm/plugin/UntagMojoTest.java | 2 +-
.../command/checkin/GitCheckInCommandNoBranchTest.java | 2 +-
.../gitexe/command/checkin/GitCheckInCommandTest.java | 4 ++--
.../command/remove/GitExeRemoveCommandTckTest.java | 2 +-
.../apache/maven/scm/provider/git/GitScmTestUtils.java | 17 ++++-------------
.../git/command/blame/GitBlameCommandTckTest.java | 2 +-
.../git/command/branch/GitBranchCommandTckTest.java | 2 +-
.../command/changelog/GitChangeLogCommandTckTest.java | 2 +-
.../git/command/checkin/GitCheckInCommandTckTest.java | 2 +-
.../git/command/status/GitStatusCommandTckTest.java | 2 +-
.../provider/git/command/tag/GitTagCommandTckTest.java | 2 +-
.../git/command/untag/GitUntagCommandTckTest.java | 2 +-
.../git/command/update/GitUpdateCommandTckTest.java | 2 +-
.../jgit/command/remove/JGitRemoveCommandTckTest.java | 9 +++++++++
16 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/.github/workflows/maven-verify.yml
b/.github/workflows/maven-verify.yml
index 67b79c251..47184916a 100644
--- a/.github/workflows/maven-verify.yml
+++ b/.github/workflows/maven-verify.yml
@@ -27,3 +27,4 @@ jobs:
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
with:
install-mercurial: true
+ maven-args: "-P tck-git -P tck-hg -P tck-svn"
diff --git a/Jenkinsfile b/Jenkinsfile
index 09ac70f12..6dc23c191 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,4 +17,4 @@
* under the License.
*/
-asfMavenTlpStdBuild()
+asfMavenTlpStdBuild(mavenArgs: "-Ptck-git -Ptck-svn")
diff --git
a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/UntagMojoTest.java
b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/UntagMojoTest.java
index 60dd9f5eb..7bf2df85d 100644
---
a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/UntagMojoTest.java
+++
b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/UntagMojoTest.java
@@ -60,7 +60,7 @@ public class UntagMojoTest extends AbstractMojoTestCase {
checkoutMojo.execute();
// Add a default user to the config
- GitScmTestUtils.setDefaultUser(checkoutDir);
+ GitScmTestUtils.setDefaulGitConfig(checkoutDir);
}
public void testUntag() throws Exception {
diff --git
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandNoBranchTest.java
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandNoBranchTest.java
index 749885434..9dc96341b 100644
---
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandNoBranchTest.java
+++
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandNoBranchTest.java
@@ -66,7 +66,7 @@ public class GitCheckInCommandNoBranchTest extends
ScmTestCase {
CheckOutScmResult checkOutScmResult = checkoutRepo(scmRepository);
// Add a default user to the config
- GitScmTestUtils.setDefaultUser(workingDirectory);
+ GitScmTestUtils.setDefaulGitConfig(workingDirectory);
assertEquals(0, checkOutScmResult.getCheckedOutFiles().size());
diff --git
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java
index 066fbe2ee..1e25fa396 100644
---
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java
+++
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java
@@ -100,7 +100,7 @@ public class GitCheckInCommandTest extends ScmTestCase {
checkoutRepoInto(checkedOutRepo, scmRepository);
// Add a default user to the config
- GitScmTestUtils.setDefaultUser(checkedOutRepo);
+ GitScmTestUtils.setDefaulGitConfig(checkedOutRepo);
// Creating foo/bar/wine.xml
File fooDir = new File(checkedOutRepo.getAbsolutePath(), "foo");
@@ -154,7 +154,7 @@ public class GitCheckInCommandTest extends ScmTestCase {
checkoutRepoInto(checkedOutRepo, scmRepository);
// Add a default user to the config
- GitScmTestUtils.setDefaultUser(checkedOutRepo);
+ GitScmTestUtils.setDefaulGitConfig(checkedOutRepo);
// Creating beer.xml and whiskey.xml
File beerFile = new File(checkedOutRepo.getAbsolutePath(), "beer.xml");
diff --git
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitExeRemoveCommandTckTest.java
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitExeRemoveCommandTckTest.java
index 3ee579f04..eec858a2c 100644
---
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitExeRemoveCommandTckTest.java
+++
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitExeRemoveCommandTckTest.java
@@ -38,7 +38,7 @@ public class GitExeRemoveCommandTckTest extends
GitRemoveCommandTckTest {
try {
return super.checkOut(workingDirectory, repository);
} finally {
- GitScmTestUtils.setDefaultUser(workingDirectory);
+ GitScmTestUtils.setDefaulGitConfig(workingDirectory);
}
}
}
diff --git
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java
index 7131c83fa..9ce819693 100644
---
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java
+++
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java
@@ -87,28 +87,19 @@ public final class GitScmTestUtils {
}
}
- public static void setDefaultUser(File repositoryRootFile) {
+ public static void setDefaulGitConfig(File repositoryRootFile) {
File gitConfigFile = new File(new File(repositoryRootFile, ".git"),
"config");
- FileWriter fw = null;
- try {
- fw = new FileWriter(gitConfigFile, true);
+ try (FileWriter fw = new FileWriter(gitConfigFile, true)) {
fw.append("[user]\n");
fw.append("\tname = John Doe\n");
fw.append("\temail = [email protected]\n");
+ fw.append("[commit]\n");
+ fw.append("\tgpgsign = false\n");
fw.flush();
- fw.close();
} catch (IOException e) {
System.err.println("cannot setup a default user for tests purpose
inside " + gitConfigFile);
e.printStackTrace();
- } finally {
- if (fw != null) {
- try {
- fw.close();
- } catch (IOException ignore) {
- // ignored
- }
- }
}
}
}
diff --git
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/blame/GitBlameCommandTckTest.java
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/blame/GitBlameCommandTckTest.java
index d7caa4d32..717648aac 100644
---
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/blame/GitBlameCommandTckTest.java
+++
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/blame/GitBlameCommandTckTest.java
@@ -39,7 +39,7 @@ public abstract class GitBlameCommandTckTest extends
BlameCommandTckTest {
try {
return super.checkOut(workingDirectory, repository);
} finally {
- GitScmTestUtils.setDefaultUser(workingDirectory);
+ GitScmTestUtils.setDefaulGitConfig(workingDirectory);
}
}
}
diff --git
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/branch/GitBranchCommandTckTest.java
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/branch/GitBranchCommandTckTest.java
index 0989720fe..4aa66bb0b 100644
---
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/branch/GitBranchCommandTckTest.java
+++
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/branch/GitBranchCommandTckTest.java
@@ -40,7 +40,7 @@ public abstract class GitBranchCommandTckTest extends
BranchCommandTckTest {
try {
return super.checkOut(workingDirectory, repository);
} finally {
- GitScmTestUtils.setDefaultUser(workingDirectory);
+ GitScmTestUtils.setDefaulGitConfig(workingDirectory);
}
}
}
diff --git
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/changelog/GitChangeLogCommandTckTest.java
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/changelog/GitChangeLogCommandTckTest.java
index ec3d20620..1bd8ad882 100644
---
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/changelog/GitChangeLogCommandTckTest.java
+++
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/changelog/GitChangeLogCommandTckTest.java
@@ -56,7 +56,7 @@ public abstract class GitChangeLogCommandTckTest extends
ChangeLogCommandTckTest
try {
return super.checkOut(workingDirectory, repository);
} finally {
- GitScmTestUtils.setDefaultUser(workingDirectory);
+ GitScmTestUtils.setDefaulGitConfig(workingDirectory);
}
}
diff --git
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkin/GitCheckInCommandTckTest.java
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkin/GitCheckInCommandTckTest.java
index 0dc8694cb..ce6e5938e 100644
---
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkin/GitCheckInCommandTckTest.java
+++
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkin/GitCheckInCommandTckTest.java
@@ -41,7 +41,7 @@ public abstract class GitCheckInCommandTckTest extends
CheckInCommandTckTest {
try {
return super.checkOut(workingDirectory, repository);
} finally {
- GitScmTestUtils.setDefaultUser(workingDirectory);
+ GitScmTestUtils.setDefaulGitConfig(workingDirectory);
}
}
}
diff --git
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/status/GitStatusCommandTckTest.java
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/status/GitStatusCommandTckTest.java
index 08711aaf9..74ca62852 100644
---
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/status/GitStatusCommandTckTest.java
+++
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/status/GitStatusCommandTckTest.java
@@ -40,7 +40,7 @@ public abstract class GitStatusCommandTckTest extends
StatusCommandTckTest {
try {
return super.checkOut(workingDirectory, repository);
} finally {
- GitScmTestUtils.setDefaultUser(workingDirectory);
+ GitScmTestUtils.setDefaulGitConfig(workingDirectory);
}
}
}
diff --git
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitTagCommandTckTest.java
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitTagCommandTckTest.java
index 28006adb0..e89a14de4 100644
---
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitTagCommandTckTest.java
+++
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitTagCommandTckTest.java
@@ -40,7 +40,7 @@ public abstract class GitTagCommandTckTest extends
TagCommandTckTest {
try {
return super.checkOut(workingDirectory, repository);
} finally {
- GitScmTestUtils.setDefaultUser(workingDirectory);
+ GitScmTestUtils.setDefaulGitConfig(workingDirectory);
}
}
}
diff --git
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/untag/GitUntagCommandTckTest.java
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/untag/GitUntagCommandTckTest.java
index b1d2c89b2..7a8fa62a6 100644
---
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/untag/GitUntagCommandTckTest.java
+++
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/untag/GitUntagCommandTckTest.java
@@ -37,7 +37,7 @@ public abstract class GitUntagCommandTckTest extends
UntagCommandTckTest {
try {
return super.checkOut(workingDirectory, repository);
} finally {
- GitScmTestUtils.setDefaultUser(workingDirectory);
+ GitScmTestUtils.setDefaulGitConfig(workingDirectory);
}
}
}
diff --git
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateCommandTckTest.java
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateCommandTckTest.java
index 998a874f9..3fa520491 100644
---
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateCommandTckTest.java
+++
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateCommandTckTest.java
@@ -40,7 +40,7 @@ public abstract class GitUpdateCommandTckTest extends
UpdateCommandTckTest {
try {
return super.checkOut(workingDirectory, repository);
} finally {
- GitScmTestUtils.setDefaultUser(workingDirectory);
+ GitScmTestUtils.setDefaulGitConfig(workingDirectory);
}
}
}
diff --git
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remove/JGitRemoveCommandTckTest.java
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remove/JGitRemoveCommandTckTest.java
index d7766de3b..93c78baf4 100644
---
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remove/JGitRemoveCommandTckTest.java
+++
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remove/JGitRemoveCommandTckTest.java
@@ -21,8 +21,10 @@ package
org.apache.maven.scm.provider.git.jgit.command.remove;
import java.io.File;
import java.io.IOException;
+import org.apache.maven.scm.command.checkout.CheckOutScmResult;
import org.apache.maven.scm.provider.git.GitScmTestUtils;
import
org.apache.maven.scm.provider.git.command.remove.GitRemoveCommandTckTest;
+import org.apache.maven.scm.repository.ScmRepository;
import org.eclipse.jgit.util.FileUtils;
/**
@@ -42,4 +44,11 @@ public class JGitRemoveCommandTckTest extends
GitRemoveCommandTckTest {
FileUtils.delete(directory, FileUtils.RECURSIVE | FileUtils.RETRY);
}
}
+
+ @Override
+ protected CheckOutScmResult checkOut(File workingDirectory, ScmRepository
repository) throws Exception {
+ CheckOutScmResult result = super.checkOut(workingDirectory,
repository);
+ GitScmTestUtils.setDefaulGitConfig(workingDirectory);
+ return result;
+ }
}
