Mercurial > hg > mercurial

changeset 994:458d170a391d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch Indore-2017.2.x
author Dmitry Neverov <dmitry.neverov@gmail.com>
date Mon, 29 Jan 2018 09:49:49 +0100
parents 5ab8be24bdb2 (current diff) e0e42fc25bc4 (diff)
children c515b69b90fd
files mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgVcsRootTest.java
diffstat 1 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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) {