Mercurial > hg > mercurial
changeset 513:575d716a6846
Fix tests on agents with enabled largefiles extension
Use hg command settings that ignores hg config on agent
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Fri, 16 Nov 2012 16:44:51 +0400 |
parents | 1533dd8058b8 |
children | 89e9c06fbc76 |
files | mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/DagFeaturesTest.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ListFilesSupportTest.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialSupportBuilder.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/RevisionFormatTest.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/UnrelatedResitoriesTest.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/Util.java |
diffstat | 6 files changed, 13 insertions(+), 65 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/DagFeaturesTest.java Fri Nov 16 15:58:26 2012 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/DagFeaturesTest.java Fri Nov 16 16:44:51 2012 +0400 @@ -7,13 +7,13 @@ import jetbrains.buildServer.vcs.CheckoutRules; import jetbrains.buildServer.vcs.ModificationData; import jetbrains.buildServer.vcs.impl.VcsRootImpl; -import org.jmock.Mockery; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import java.io.File; import java.util.List; +import static jetbrains.buildServer.buildTriggers.vcs.mercurial.MercurialSupportBuilder.mercurialSupport; import static jetbrains.buildServer.buildTriggers.vcs.mercurial.Util.copyRepository; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertFalse; @@ -37,7 +37,7 @@ ServerPluginConfig config = new ServerPluginConfigBuilder() .cachesDir(myTempFiles.createTempDir()) .build(); - myHg = Util.createMercurialServerSupport(new Mockery(), config); + myHg = mercurialSupport().withConfig(config).build(); File original = new File("mercurial-tests/testData/rep2"); File copy = new File(myTempFiles.createTempDir(), "rep2");
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ListFilesSupportTest.java Fri Nov 16 15:58:26 2012 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ListFilesSupportTest.java Fri Nov 16 16:44:51 2012 +0400 @@ -9,7 +9,6 @@ import jetbrains.buildServer.vcs.VcsFileData; import jetbrains.buildServer.vcs.VcsRoot; import org.jetbrains.annotations.NotNull; -import org.jmock.Mockery; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -17,6 +16,7 @@ import java.io.IOException; import java.util.Collection; +import static jetbrains.buildServer.buildTriggers.vcs.mercurial.MercurialSupportBuilder.mercurialSupport; import static jetbrains.buildServer.buildTriggers.vcs.mercurial.Util.copyRepository; import static jetbrains.buildServer.buildTriggers.vcs.mercurial.VcsRootBuilder.vcsRoot; import static org.testng.AssertJUnit.assertFalse; @@ -40,11 +40,10 @@ @BeforeMethod protected void setUp() throws Exception { TempFiles tempFiles = new TempFiles(); - Mockery context = new Mockery(); ServerPluginConfig myPluginConfig = new ServerPluginConfigBuilder() .cachesDir(tempFiles.createTempDir()) .build(); - myVcs = Util.createMercurialServerSupport(context, myPluginConfig); + myVcs = mercurialSupport().withConfig(myPluginConfig).build(); myRemoteRepoDir = tempFiles.createTempDir(); copyRepository(new File("mercurial-tests/testData/rep1"), myRemoteRepoDir);
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialSupportBuilder.java Fri Nov 16 15:58:26 2012 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialSupportBuilder.java Fri Nov 16 16:44:51 2012 +0400 @@ -1,5 +1,7 @@ package jetbrains.buildServer.buildTriggers.vcs.mercurial; +import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.CommandSettingsFactory; +import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.TestCommandSettingsFactory; import jetbrains.buildServer.serverSide.BuildServerListener; import jetbrains.buildServer.serverSide.SBuildServer; import jetbrains.buildServer.util.EventDispatcher; @@ -19,10 +21,10 @@ public class MercurialSupportBuilder { private Mockery myContext; - private ServerPluginConfigBuilder myConfigBuilder; private ServerPluginConfig myConfig; private List<MercurialServerExtension> myExtensions = new ArrayList<MercurialServerExtension>(); private HgVcsRootFactory myHgRootFactory; + private CommandSettingsFactory myCommandSettingsFactory = new TestCommandSettingsFactory(); public static MercurialSupportBuilder mercurialSupport() { return new MercurialSupportBuilder(); @@ -39,12 +41,10 @@ allowing(server).getExecutor(); will(returnValue(executor)); }}); EventDispatcher<BuildServerListener> dispatcher = EventDispatcher.create(BuildServerListener.class); - if (myConfig == null) - myConfig = myConfigBuilder.build(); myHgRootFactory = new HgVcsRootFactory(myConfig); MirrorManagerImpl mirrorManager = new MirrorManagerImpl(myConfig); ServerHgPathProvider hgPathProvider = new ServerHgPathProvider(myConfig); - RepoFactory repoFactory = new RepoFactory(myConfig, new ServerCommandSettingsFactory()); + RepoFactory repoFactory = new RepoFactory(myConfig, myCommandSettingsFactory); HgTestConnectionSupport testConnection = new HgTestConnectionSupport(myHgRootFactory, repoFactory, mirrorManager, hgPathProvider); final ResetCacheRegister resetCacheManager = myContext.mock(ResetCacheRegister.class); myContext.checking(new Expectations() {{ @@ -55,16 +55,6 @@ } - public MercurialSupportBuilder withContext(@NotNull Mockery context) { - myContext = context; - return this; - } - - public MercurialSupportBuilder withConfig(@NotNull ServerPluginConfigBuilder config) { - myConfigBuilder = config; - return this; - } - public MercurialSupportBuilder withConfig(@NotNull ServerPluginConfig config) { myConfig = config; return this;
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/RevisionFormatTest.java Fri Nov 16 15:58:26 2012 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/RevisionFormatTest.java Fri Nov 16 16:44:51 2012 +0400 @@ -8,7 +8,6 @@ import jetbrains.buildServer.vcs.*; import jetbrains.buildServer.vcs.patches.PatchTestCase; import org.jetbrains.annotations.NotNull; -import org.jmock.Mockery; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -19,6 +18,7 @@ import java.util.List; import java.util.Map; +import static jetbrains.buildServer.buildTriggers.vcs.mercurial.MercurialSupportBuilder.mercurialSupport; import static jetbrains.buildServer.buildTriggers.vcs.mercurial.Util.buildPatch; import static jetbrains.buildServer.buildTriggers.vcs.mercurial.Util.copyRepository; import static jetbrains.buildServer.buildTriggers.vcs.mercurial.VcsRootBuilder.vcsRoot; @@ -38,11 +38,10 @@ @BeforeMethod public void setUp() throws Exception { myTempFiles = new TempFiles(); - Mockery context = new Mockery(); - ServerPluginConfig myPluginConfig = new ServerPluginConfigBuilder() + ServerPluginConfig pluginConfig = new ServerPluginConfigBuilder() .cachesDir(myTempFiles.createTempDir()) .build(); - myVcs = Util.createMercurialServerSupport(context, myPluginConfig); + myVcs = mercurialSupport().withConfig(pluginConfig).build(); myRemoteRepoDir = copyRepository(myTempFiles, new File("mercurial-tests/testData/rep1").getAbsolutePath()); myRoot = vcsRoot().withUrl(myRemoteRepoDir.getAbsolutePath()).build();
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/UnrelatedResitoriesTest.java Fri Nov 16 15:58:26 2012 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/UnrelatedResitoriesTest.java Fri Nov 16 16:44:51 2012 +0400 @@ -8,7 +8,6 @@ import jetbrains.buildServer.vcs.VcsException; import jetbrains.buildServer.vcs.impl.VcsRootImpl; import org.jetbrains.annotations.NotNull; -import org.jmock.Mockery; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -16,6 +15,7 @@ import java.io.File; import java.io.IOException; +import static jetbrains.buildServer.buildTriggers.vcs.mercurial.MercurialSupportBuilder.mercurialSupport; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertTrue; @@ -30,7 +30,6 @@ private TempFiles myTempFiles; private File myRepositoryLocation; private VcsRootImpl myRoot; - private Mockery myContext; private ServerPluginConfig myPluginConfig; static { @@ -39,7 +38,6 @@ @BeforeMethod public void setUp() throws Exception { - myContext = new Mockery(); myTempFiles = new TempFiles(); myPluginConfig = new ServerPluginConfigBuilder() .cachesDir(myTempFiles.createTempDir()) @@ -88,6 +86,6 @@ } private MercurialVcsSupport createVcs() throws IOException { - return Util.createMercurialServerSupport(myContext, myPluginConfig); + return mercurialSupport().withConfig(myPluginConfig).build(); } }
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/Util.java Fri Nov 16 15:58:26 2012 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/Util.java Fri Nov 16 16:44:51 2012 +0400 @@ -1,29 +1,17 @@ package jetbrains.buildServer.buildTriggers.vcs.mercurial; import jetbrains.buildServer.TempFiles; -import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.TestCommandSettingsFactory; -import jetbrains.buildServer.serverSide.BuildServerListener; -import jetbrains.buildServer.serverSide.SBuildServer; -import jetbrains.buildServer.util.EventDispatcher; import jetbrains.buildServer.util.FileUtil; -import jetbrains.buildServer.util.cache.ResetCacheHandler; -import jetbrains.buildServer.util.cache.ResetCacheRegister; import jetbrains.buildServer.vcs.CheckoutRules; import jetbrains.buildServer.vcs.VcsException; -import jetbrains.buildServer.vcs.VcsManager; import jetbrains.buildServer.vcs.VcsRoot; import jetbrains.buildServer.vcs.patches.PatchBuilderImpl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jmock.Expectations; -import org.jmock.Mockery; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; -import java.util.Collections; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; /** * @author dmitry.neverov @@ -42,32 +30,6 @@ } - public static MercurialVcsSupport createMercurialServerSupport(@NotNull Mockery context, ServerPluginConfig config) throws IOException { - return createMercurialServerSupport(context, config, new RepoFactory(config, new TestCommandSettingsFactory())); - } - - - public static MercurialVcsSupport createMercurialServerSupport(@NotNull Mockery context, @NotNull ServerPluginConfig config, @NotNull RepoFactory repoFactory) throws IOException { - VcsManager vcsManager = context.mock(VcsManager.class); - final SBuildServer server = context.mock(SBuildServer.class); - final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(); - context.checking(new Expectations() {{ - allowing(server).getExecutor(); will(returnValue(executor)); - }}); - EventDispatcher<BuildServerListener> dispatcher = EventDispatcher.create(BuildServerListener.class); - HgVcsRootFactory hgVcsRootFactory = new HgVcsRootFactory(config); - MirrorManagerImpl mirrorManager = new MirrorManagerImpl(config); - ServerHgPathProvider hgPathProvider = new ServerHgPathProvider(config); - HgTestConnectionSupport testConnection = new HgTestConnectionSupport(hgVcsRootFactory, repoFactory, mirrorManager, hgPathProvider); - final ResetCacheRegister resetCacheManager = context.mock(ResetCacheRegister.class); - context.checking(new Expectations() {{ - allowing(resetCacheManager).registerHandler(with(any(ResetCacheHandler.class))); - }}); - return new MercurialVcsSupport(vcsManager, server, dispatcher, resetCacheManager, config, hgPathProvider, - repoFactory, mirrorManager, hgVcsRootFactory, testConnection, Collections.<MercurialServerExtension>emptyList()); - } - - public static File copyRepository(@NotNull TempFiles tempFiles, @NotNull String repPath) throws IOException { File tempDir = tempFiles.createTempDir(); copyRepository(new File(repPath), tempDir);