diff options
author | Martin Polden <martin.polden@gmail.com> | 2017-05-16 11:16:04 +0200 |
---|---|---|
committer | Andreas Eriksen <andreer@pvv.ntnu.no> | 2017-05-16 11:16:04 +0200 |
commit | 7c6bf9709b5fa2d0b8b0a7e541a7e6461d7b7be9 (patch) | |
tree | 6d41f0344253ae03466a27d59f21ce2c06a90a23 /node-admin | |
parent | 4a5c2bc2b5e0cf33ffb53d1c54deb08077a0bad3 (diff) |
Fix rollback test (#2470)
Diffstat (limited to 'node-admin')
-rw-r--r-- | node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java index f3cc352a3b8..93371c93f73 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java @@ -17,6 +17,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyVararg; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; @@ -26,6 +27,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; public class AclMaintainerTest { + private static final String NODE_ADMIN_HOSTNAME = "node-admin.region-1.yahoo.com"; private AclMaintainer aclMaintainer; @@ -95,15 +97,16 @@ public class AclMaintainerTest { doThrow(new RuntimeException("iptables command failed")) .doNothing() .when(dockerOperations) - .executeCommandInNetworkNamespace(any(), any()); + .executeCommandInNetworkNamespace(any(), anyVararg()); aclMaintainer.run(); verify(dockerOperations).executeCommandInNetworkNamespace( eq(container.name), eq("ip6tables"), - eq("-F"), - eq("INPUT") + eq("-P"), + eq("INPUT"), + eq("ACCEPT") ); } @@ -209,4 +212,5 @@ public class AclMaintainerTest { .mapToObj(i -> new ContainerAclSpec("node-" + i, "::" + i, containerName)) .collect(Collectors.toList()); } + } |