# HG changeset patch # User Dmitry Neverov # Date 1517215789 -3600 # Node ID 458d170a391de54fce34a060ad963e0a0a4350c8 # Parent 5ab8be24bdb26bc8f75b9b3f9e65509943024766# Parent e0e42fc25bc4cc9971aa84addc3b707f4d699d53 Merge branch Indore-2017.2.x diff -r 5ab8be24bdb2 -r 458d170a391d mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgVcsRootTest.java --- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgVcsRootTest.java Mon Jan 29 09:41:26 2018 +0100 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgVcsRootTest.java Mon Jan 29 09:49:49 2018 +0100 @@ -177,12 +177,9 @@ String customConfig = "[extensions]\nsome.ext ="; VcsRoot root = vcsRoot().withUrl("http://some.org/repo").withCustomConfig(customConfig).build(); assertEquals(customConfig, new HgVcsRoot(root).getCustomHgConfig()); - try { - System.setProperty(Constants.CUSTOM_HG_CONFIG_ENABLED, "false"); - assertEquals("", new HgVcsRoot(root).getCustomHgConfig()); - } finally { - System.getProperties().remove(Constants.CUSTOM_HG_CONFIG_ENABLED); - } + assertEquals("", new HgVcsRoot(root).getCustomHgConfigServer()); + setInternalProperty(Constants.CUSTOM_HG_CONFIG_ENABLED, "true"); + assertEquals(customConfig, new HgVcsRoot(root).getCustomHgConfigServer()); } private VcsRootImpl createVcsRoot(String url) {