summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorValerij Fredriksen <valerij92@gmail.com>2018-05-07 22:08:17 +0200
committerValerij Fredriksen <valerij92@gmail.com>2018-05-07 22:13:54 +0200
commit3fbd22f037518a171aa14591e3921a568ad38b82 (patch)
tree64548048c6b5272c68f5f6fd5829eb43d78b6a03 /node-admin
parent1ad3b3138ebe70aa122071e12ba210d9dd3d79e5 (diff)
Remove unncessary throws
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java2
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java2
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java4
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java2
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java2
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java4
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileAttributesCacheTest.java2
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileContentCacheTest.java4
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/TemplateTest.java2
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/UnixPathTest.java8
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/systemd/SystemCtlTest.java18
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/AddYumRepoTest.java2
12 files changed, 26 insertions, 26 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java
index 7f9f0027546..ae5ba9681e6 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java
@@ -101,7 +101,7 @@ public class RealNodeRepositoryTest {
}
@Test
- public void testGetContainersToRunApi() throws InterruptedException {
+ public void testGetContainersToRunApi() {
String dockerHostHostname = "dockerhost1.yahoo.com";
final List<NodeSpec> containersToRun = nodeRepositoryApi.getNodes(dockerHostHostname);
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java
index e5f35f17aed..4526891d24a 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java
@@ -43,7 +43,7 @@ public class DockerOperationsImplTest {
= new DockerOperationsImpl(docker, environment, processExecuter, addressesMock);
@Test
- public void processResultFromNodeProgramWhenSuccess() throws Exception {
+ public void processResultFromNodeProgramWhenSuccess() {
final ContainerName containerName = new ContainerName("container-name");
final ProcessResult actualResult = new ProcessResult(0, "output", "errors");
final String programPath = "/bin/command";
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java
index 063e478ffb4..16e311cdec1 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java
@@ -43,7 +43,7 @@ public class NodeStateTest {
@Test
- public void activeToDirty() throws InterruptedException, IOException {
+ public void activeToDirty() throws InterruptedException {
try (DockerTester dockerTester = new DockerTester()) {
setup(dockerTester);
// Change node state to dirty
@@ -68,7 +68,7 @@ public class NodeStateTest {
}
@Test
- public void activeToInactiveToActive() throws InterruptedException, IOException {
+ public void activeToInactiveToActive() throws InterruptedException {
try (DockerTester dockerTester = new DockerTester()) {
setup(dockerTester);
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java
index f8746bcc22a..c5621b2f0e6 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java
@@ -27,7 +27,7 @@ public class RebootTest {
@Test
@Ignore
- public void test() throws InterruptedException, UnknownHostException {
+ public void test() throws InterruptedException {
try (DockerTester dockerTester = new DockerTester()) {
dockerTester.addNodeRepositoryNode(createNodeRepositoryNode());
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java
index d029d356d77..91071cf096c 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java
@@ -17,7 +17,7 @@ import java.net.UnknownHostException;
public class RestartTest {
@Test
- public void test() throws InterruptedException, UnknownHostException {
+ public void test() throws InterruptedException {
try (DockerTester dockerTester = new DockerTester()) {
long wantedRestartGeneration = 1;
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java
index 22aa7a5d229..91c61623ee7 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java
@@ -54,7 +54,7 @@ public class NodeAdminImplTest {
new MetricReceiverWrapper(MetricReceiver.nullImplementation), clock);
@Test
- public void nodeAgentsAreProperlyLifeCycleManaged() throws Exception {
+ public void nodeAgentsAreProperlyLifeCycleManaged() {
final String hostName1 = "host1.test.yahoo.com";
final String hostName2 = "host2.test.yahoo.com";
final ContainerName containerName1 = ContainerName.fromHostname(hostName1);
@@ -98,7 +98,7 @@ public class NodeAdminImplTest {
}
@Test
- public void testSetFrozen() throws Exception {
+ public void testSetFrozen() {
List<NodeAgent> nodeAgents = new ArrayList<>();
List<String> existingContainerHostnames = new ArrayList<>();
for (int i = 0; i < 3; i++) {
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileAttributesCacheTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileAttributesCacheTest.java
index 9224faf1c6f..06192c9f308 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileAttributesCacheTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileAttributesCacheTest.java
@@ -17,7 +17,7 @@ import static org.mockito.Mockito.when;
public class FileAttributesCacheTest {
@Test
- public void exists() throws Exception {
+ public void exists() {
UnixPath unixPath = mock(UnixPath.class);
FileAttributesCache cache = new FileAttributesCache(unixPath);
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileContentCacheTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileContentCacheTest.java
index 677dd048445..83ab5462fb6 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileContentCacheTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileContentCacheTest.java
@@ -18,7 +18,7 @@ public class FileContentCacheTest {
private final FileContentCache cache = new FileContentCache(unixPath);
@Test
- public void get() throws Exception {
+ public void get() {
when(unixPath.readUtf8File()).thenReturn("content");
assertEquals("content", cache.get(Instant.ofEpochMilli(0)));
verify(unixPath, times(1)).readUtf8File();
@@ -45,7 +45,7 @@ public class FileContentCacheTest {
}
@Test
- public void updateWith() throws Exception {
+ public void updateWith() {
cache.updateWith("content", Instant.ofEpochMilli(2));
assertEquals("content", cache.get(Instant.ofEpochMilli(2)));
verifyNoMoreInteractions(unixPath);
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/TemplateTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/TemplateTest.java
index 7aa672e9e80..cd3a33e54b6 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/TemplateTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/TemplateTest.java
@@ -18,7 +18,7 @@ import static org.mockito.Mockito.mock;
public class TemplateTest {
@Test
- public void basic() throws IOException {
+ public void basic() {
FileSystem fileSystem = TestFileSystem.create();
Path templatePath = fileSystem.getPath("/example.vm");
String templateContent = "a $x, $y b";
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/UnixPathTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/UnixPathTest.java
index 6f1991ec3d4..8d3d336a4ac 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/UnixPathTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/UnixPathTest.java
@@ -20,7 +20,7 @@ public class UnixPathTest {
final FileSystem fileSystem = TestFileSystem.create();
@Test
- public void createParents() throws Exception {
+ public void createParents() {
Path parentDirectory = fileSystem.getPath("/a/b/c");
Path filePath = parentDirectory.resolve("bar");
UnixPath path = new UnixPath(filePath);
@@ -31,7 +31,7 @@ public class UnixPathTest {
}
@Test
- public void utf8File() throws Exception {
+ public void utf8File() {
String original = "foo\nbar\n";
UnixPath path = new UnixPath(fileSystem.getPath("example.txt"));
path.writeUtf8File(original);
@@ -40,7 +40,7 @@ public class UnixPathTest {
}
@Test
- public void permissions() throws Exception {
+ public void permissions() {
String expectedPermissions = "rwxr-x---";
UnixPath path = new UnixPath(fileSystem.getPath("file.txt"));
path.writeUtf8File("foo");
@@ -54,7 +54,7 @@ public class UnixPathTest {
}
@Test
- public void owner() throws Exception {
+ public void owner() {
FileSystem fs = TestFileSystem.create();
Path path = fs.getPath("file.txt");
UnixPath unixPath = new UnixPath(path);
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/systemd/SystemCtlTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/systemd/SystemCtlTest.java
index 085402410b3..315138e897f 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/systemd/SystemCtlTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/systemd/SystemCtlTest.java
@@ -19,7 +19,7 @@ public class SystemCtlTest {
private final TestTerminal terminal = new TestTerminal();
@Test
- public void enable() throws Exception {
+ public void enable() {
terminal.expectCommand(
"systemctl show docker 2>&1",
0,
@@ -33,7 +33,7 @@ public class SystemCtlTest {
}
@Test
- public void enableIsNoop() throws Exception {
+ public void enableIsNoop() {
terminal.expectCommand(
"systemctl show docker 2>&1",
0,
@@ -48,7 +48,7 @@ public class SystemCtlTest {
@Test
- public void enableCommandFailre() throws Exception {
+ public void enableCommandFailre() {
terminal.expectCommand("systemctl show docker 2>&1", 1, "error");
SystemCtl.SystemCtlEnable enableDockerService = new SystemCtl(terminal).enable("docker");
try {
@@ -61,7 +61,7 @@ public class SystemCtlTest {
@Test
- public void start() throws Exception {
+ public void start() {
terminal.expectCommand(
"systemctl show docker 2>&1",
0,
@@ -75,7 +75,7 @@ public class SystemCtlTest {
}
@Test
- public void startIsNoop() throws Exception {
+ public void startIsNoop() {
terminal.expectCommand(
"systemctl show docker 2>&1",
0,
@@ -90,7 +90,7 @@ public class SystemCtlTest {
@Test
- public void startCommandFailre() throws Exception {
+ public void startCommandFailre() {
terminal.expectCommand("systemctl show docker 2>&1", 1, "error");
SystemCtl.SystemCtlStart startDockerService = new SystemCtl(terminal).start("docker");
try {
@@ -103,7 +103,7 @@ public class SystemCtlTest {
@Test
- public void disable() throws Exception {
+ public void disable() {
terminal.expectCommand(
"systemctl show docker 2>&1",
0,
@@ -116,7 +116,7 @@ public class SystemCtlTest {
}
@Test
- public void stop() throws Exception {
+ public void stop() {
terminal.expectCommand(
"systemctl show docker 2>&1",
0,
@@ -129,7 +129,7 @@ public class SystemCtlTest {
}
@Test
- public void restart() throws Exception {
+ public void restart() {
terminal.expectCommand("systemctl restart docker 2>&1", 0, "");
assertTrue(new SystemCtl(terminal).restart("docker").converge(taskContext));
}
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/AddYumRepoTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/AddYumRepoTest.java
index 399759c7c0a..c6314439003 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/AddYumRepoTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/AddYumRepoTest.java
@@ -17,7 +17,7 @@ import static org.mockito.Mockito.mock;
public class AddYumRepoTest {
@Test
- public void converge() throws Exception {
+ public void converge() {
String repositoryId = "repoid";
String name = "name";
String baseurl = "http://foo.com/bar";