diff --git a/deploy.sh b/deploy.sh index 9576bcc254b..c9b1d113b0b 100644 --- a/deploy.sh +++ b/deploy.sh @@ -1,3 +1,3 @@ #!/bin/bash -ssh tron@47.93.9.236 -p 22008 sh /home/tron/workspace/deploy_all.sh -./gradlew stest +#ssh tron@47.93.9.236 -p 22008 sh /home/tron/workspace/deploy_all.sh +#./gradlew stest diff --git a/src/test/java/stest/tron/wallet/account/WalletTestAccount006.java b/src/test/java/stest/tron/wallet/account/WalletTestAccount006.java index 74c421a2352..a90cb9732de 100644 --- a/src/test/java/stest/tron/wallet/account/WalletTestAccount006.java +++ b/src/test/java/stest/tron/wallet/account/WalletTestAccount006.java @@ -58,7 +58,7 @@ public void beforeSuite() { @BeforeClass(enabled = true) public void beforeClass() { - logger.info(account006Key); + PublicMethed.printAddress(account006Key); channelFull = ManagedChannelBuilder.forTarget(fullnode) .usePlaintext(true) @@ -95,6 +95,7 @@ public void testGetAccountNet() { Assert.assertTrue(accountNetMessage.getFreeNetUsed() == 0); Assert.assertTrue(accountNetMessage.getTotalNetLimit() > 0); Assert.assertTrue(accountNetMessage.getTotalNetWeight() > 0); + logger.info("testGetAccountNet"); } @@ -110,6 +111,7 @@ public void testUseFreeNet() { //Every transaction may cost 200 net. Assert.assertTrue(accountNetMessage.getFreeNetUsed() > 0 && accountNetMessage .getFreeNetUsed() < 300); + logger.info("testUseFreeNet"); } @Test(enabled = true) @@ -120,7 +122,8 @@ public void testUseMoneyToDoTransaction() { Account request = Account.newBuilder().setAddress(addressBs).build(); AccountNetMessage accountNetMessage = blockingStubFull.getAccountNet(request); //Use out the free net - while (accountNetMessage.getFreeNetUsed() < BASELINE) { + Integer times = 0; + while (accountNetMessage.getFreeNetUsed() < BASELINE && times++ < 30) { PublicMethed.sendcoin(fromAddress,1L,account006Address,account006Key, blockingStubFull); accountNetMessage = blockingStubFull.getAccountNet(request); @@ -134,6 +137,7 @@ public void testUseMoneyToDoTransaction() { Long afterSendBalance = queryAccount.getBalance(); //when the free net is not enough and no balance freeze, use money to do the transaction. Assert.assertTrue(beforeSendBalance - afterSendBalance > 1); + logger.info("testUseMoneyToDoTransaction"); } @Test(enabled = true)