Mercurial > hg > mercurial
changeset 929:ccb34ee7c03b
Merge branch Hajipur-9.0.x
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Fri, 27 Feb 2015 11:36:50 +0100 |
parents | 9291f2627c2a (current diff) cccd4e722ca4 (diff) |
children | 1f19b1a10edb |
files | |
diffstat | 1 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/CommitsInfoBuilderSupportTest.java Mon Feb 16 12:24:10 2015 +0100 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/CommitsInfoBuilderSupportTest.java Fri Feb 27 11:36:50 2015 +0100 @@ -21,6 +21,7 @@ import jetbrains.vcs.api.CommitInfo; import org.jetbrains.annotations.NotNull; import org.testng.Assert; +import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -44,11 +45,14 @@ private File myRemoteRepo; private MercurialVcsSupport myVcs; private MercurialCommitsInfoBuilderSupport mySupport; + private TestLogger myTestLogger; + @Override @BeforeMethod public void setUp() throws Exception { super.setUp(); + myTestLogger = new TestLogger(); ServerPluginConfig pluginConfig = new ServerPluginConfigBuilder() // .hgPath("hg") .cachesDir(myTempFiles.createTempDir()) @@ -60,8 +64,15 @@ copyRepository(new File("mercurial-tests/testData/rep2"), myRemoteRepo); } + @Override + @AfterMethod + public void tearDown() { + super.tearDown(); + myTestLogger.disableDebug(); + } + public void simpleTest(@NotNull HgVersion _) throws IOException, VcsException { - TestLogger.enableMainAndVCSLoggerDebug(); + myTestLogger.enableDebug(); VcsRoot root = vcsRoot().withUrl(myRemoteRepo).build(); @@ -103,7 +114,7 @@ } public void should_not_have_parse_errors(@NotNull HgVersion _) throws IOException, VcsException { - TestLogger.enableMainAndVCSLoggerDebug(); + myTestLogger.enableDebug(); VcsRoot root = vcsRoot().withUrl(myRemoteRepo).build();