This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 3b8687643a291c53a18811311dbda42f638b9f82 Author: Christian Bourque <christian.bour...@expretio.com> AuthorDate: Mon Oct 1 00:20:46 2018 -0400 Do not run Git integration tests by default --- ide/libs.git/nbproject/project.properties | 2 ++ .../org/netbeans/libs/git/jgit/ConnectionTest.java | 19 +++++++++++++++++++ .../netbeans/libs/git/jgit/commands/CheckoutTest.java | 10 +++++++++- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/ide/libs.git/nbproject/project.properties b/ide/libs.git/nbproject/project.properties index 821d146..9bfc317 100644 --- a/ide/libs.git/nbproject/project.properties +++ b/ide/libs.git/nbproject/project.properties @@ -25,6 +25,8 @@ nbm.homepage=http://netbeans.org/projects/versioncontrol/pages/Git_main nbm.module.author=Ondrej Vrabec sigtest.gen.fail.on.error=false +test-unit-sys-prop.skip.git.integration.tests=true + test.config.stableBTD.includes=**/*Test.class test.config.stableBTD.excludes=\ **/AddTest.class,\ diff --git a/ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/ConnectionTest.java b/ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/ConnectionTest.java index 0d62f1e..2d9d124 100644 --- a/ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/ConnectionTest.java +++ b/ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/ConnectionTest.java @@ -29,6 +29,7 @@ import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.storage.file.FileBasedConfig; import org.eclipse.jgit.util.FS; import org.eclipse.jgit.util.SystemReader; +import org.netbeans.junit.Filter; import org.netbeans.libs.git.GitClient; import org.netbeans.libs.git.GitClientCallback; import org.netbeans.libs.git.GitException; @@ -44,6 +45,24 @@ public class ConnectionTest extends AbstractGitTestCase { public ConnectionTest (String testName) throws IOException { super(testName); + if (Boolean.getBoolean("skip.git.integration.tests")) { + Filter filter = new Filter(); + filter.setExcludes(new Filter.IncludeExclude[] { + new Filter.IncludeExclude("testGitConnection", ""), + new Filter.IncludeExclude("testHttpConnection", ""), + new Filter.IncludeExclude("testHttpConnectionPublic", ""), + new Filter.IncludeExclude("testHttpConnectionCredentialsInUri", ""), + new Filter.IncludeExclude("testHttpConnectionEmptyPassword", ""), + new Filter.IncludeExclude("testSshConnectionCredentialsInUri", ""), + new Filter.IncludeExclude("testSshConnectionCredentialsFromCallback", ""), + new Filter.IncludeExclude("testSshConnectionGITSSH_Issue213394", ""), + new Filter.IncludeExclude("testSshConnectionPassphrase", ""), + new Filter.IncludeExclude("testSshFetchCredentialsFromCallback", ""), + new Filter.IncludeExclude("testSshConnectionUserInUriPasswordFromCallback", ""), + new Filter.IncludeExclude("testSshConnectionCanceled", "") + }); + setFilter(filter); + } } @Override diff --git a/ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/CheckoutTest.java b/ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/CheckoutTest.java index c1079aa..ace208a 100644 --- a/ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/CheckoutTest.java +++ b/ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/CheckoutTest.java @@ -47,6 +47,7 @@ import org.eclipse.jgit.lib.StoredConfig; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.storage.file.WindowCacheConfig; +import org.netbeans.junit.Filter; import org.netbeans.libs.git.ApiUtils; import org.netbeans.libs.git.GitBranch; import org.netbeans.libs.git.GitClient; @@ -66,9 +67,16 @@ public class CheckoutTest extends AbstractGitTestCase { private File workDir; private Repository repository; private static final String BRANCH = "nova"; - + public CheckoutTest (String testName) throws IOException { super(testName); + if (Boolean.getBoolean("skip.git.integration.tests")) { + Filter filter = new Filter(); + filter.setExcludes(new Filter.IncludeExclude[] { + new Filter.IncludeExclude("testLargeFile", ""), + }); + setFilter(filter); + } } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists