You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/03/02 12:06:08 UTC
[4/5] git commit: updated refs/heads/master to 541c23e
CLOUDSTACK-8279: Fix unit test for java 1.8
Signed-off-by: Laszlo Hornyak <la...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/df11bb28
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/df11bb28
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/df11bb28
Branch: refs/heads/master
Commit: df11bb28110d49b5a46790c351a3f309b5c6569e
Parents: f8c003d
Author: Laszlo Hornyak <la...@gmail.com>
Authored: Fri Feb 27 20:06:27 2015 +0100
Committer: Laszlo Hornyak <la...@gmail.com>
Committed: Fri Feb 27 20:06:27 2015 +0100
----------------------------------------------------------------------
.../resource/virtualnetwork/VirtualRoutingResourceTest.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/df11bb28/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
----------------------------------------------------------------------
diff --git a/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java b/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
index 6d7ff29..c6189c5 100644
--- a/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
+++ b/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
@@ -674,7 +674,13 @@ public class VirtualRoutingResourceTest implements VirtualRouterDeployer {
private void verifyArgs(SetFirewallRulesCommand cmd, String script, String args) {
assertEquals(script, VRScripts.FIREWALL_INGRESS);
- assertEquals(args, " -F -a 64.10.10.10:ICMP:0:0:10.10.1.1/24-10.10.1.2/24:,64.10.10.10:TCP:22:80:10.10.1.1/24-10.10.1.2/24:,64.10.10.10:reverted:0:0:0:,");
+
+ //Since the arguments are generated with a Set
+ //one can not make a bet on the order
+ assertTrue(args.startsWith(" -F -a "));
+ assertTrue(args.contains("64.10.10.10:ICMP:0:0:10.10.1.1/24-10.10.1.2/24:"));
+ assertTrue(args.contains("64.10.10.10:reverted:0:0:0:"));
+ assertTrue(args.contains("64.10.10.10:TCP:22:80:10.10.1.1/24-10.10.1.2/24:"));
}
@Test