Merge pull request tronprotocol#670 from taihaofu/switch_ports_for_no…

…deImplTest add new ports for nodeImpl related tests to avoid conflicts
shymi80 · May 9, 2018 · 21a1719 · 21a1719
2 parents 4a629d4 + 26c6e62
commit 21a1719
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/test/java/org/tron/core/net/node/BroadTest.java b/src/test/java/org/tron/core/net/node/BroadTest.java
@@ -268,7 +268,9 @@ public void run() {
 
   @After
   public void destroy() {
+    Args.clearParam();
     FileUtil.deleteDir(new File("output-nodeImplTest"));
+    peerClient.close();
   }
-
+  
 }
diff --git a/src/test/java/org/tron/core/net/node/HandleSyncBlockTest.java b/src/test/java/org/tron/core/net/node/HandleSyncBlockTest.java
@@ -154,7 +154,7 @@ public void run() {
                 logger.info("Full node running.");
                 Args.setParam(new String[]{"-d",dbPath}, "config.conf");
                 Args cfgArgs = Args.getInstance();
-                cfgArgs.setNodeListenPort(17889);
+                cfgArgs.setNodeListenPort(17891);
                 cfgArgs.setNodeDiscoveryEnable(false);
                 cfgArgs.getSeedNode().getIpList().clear();
                 cfgArgs.setNeedSyncCheck(false);
@@ -214,7 +214,7 @@ private void prepare() {
             mainWorker.shutdownNow();
 
             org.tron.common.overlay.discover.Node node = new Node(
-                    "enode://e437a4836b77ad9d9ffe73ee782ef2614e6d8370fcf62191a6e488276e23717147073a7ce0b444d485fff5a0c34c4577251a7a990cf80d8542e21b95aa8c5e6c@127.0.0.1:17889");
+                    "enode://e437a4836b77ad9d9ffe73ee782ef2614e6d8370fcf62191a6e488276e23717147073a7ce0b444d485fff5a0c34c4577251a7a990cf80d8542e21b95aa8c5e6c@127.0.0.1:17891");
             new Thread(new Runnable() {
                 @Override
                 public void run() {
@@ -253,6 +253,8 @@ public void run() {
 
     @After
     public void destroy() {
+        Args.clearParam();
         FileUtil.deleteDir(new File("output-nodeImplTest"));
+        peerClient.close();
     }
 }
diff --git a/src/test/java/org/tron/core/net/node/StartFetchSyncBlockTest.java b/src/test/java/org/tron/core/net/node/StartFetchSyncBlockTest.java
@@ -120,7 +120,7 @@ public void run() {
         logger.info("Full node running.");
         Args.setParam(new String[]{"-d", dbPath}, "config.conf");
         Args cfgArgs = Args.getInstance();
-        cfgArgs.setNodeListenPort(17889);
+        cfgArgs.setNodeListenPort(17890);
         cfgArgs.setNodeDiscoveryEnable(false);
         cfgArgs.getSeedNode().getIpList().clear();
         cfgArgs.setNeedSyncCheck(false);
@@ -186,7 +186,7 @@ private void prepare() {
       mainWorker.shutdownNow();
 
       org.tron.common.overlay.discover.Node node = new Node(
-          "enode://e437a4836b77ad9d9ffe73ee782ef2614e6d8370fcf62191a6e488276e23717147073a7ce0b444d485fff5a0c34c4577251a7a990cf80d8542e21b95aa8c5e6c@127.0.0.1:17889");
+          "enode://e437a4836b77ad9d9ffe73ee782ef2614e6d8370fcf62191a6e488276e23717147073a7ce0b444d485fff5a0c34c4577251a7a990cf80d8542e21b95aa8c5e6c@127.0.0.1:17890");
       new Thread(new Runnable() {
         @Override
         public void run() {
@@ -225,6 +225,8 @@ public void run() {
 
   @After
   public void destroy() {
+    Args.clearParam();
     FileUtil.deleteDir(new File("output-nodeImplTest"));
+    peerClient.close();
   }
 }