aboutsummaryrefslogtreecommitdiffstats
path: root/node-admin/src
diff options
context:
space:
mode:
authorvalerijf <valerijf@yahoo-inc.com>2017-08-10 11:52:41 +0200
committervalerijf <valerijf@yahoo-inc.com>2017-08-10 11:52:41 +0200
commit99aa7653c3688f1db8714fc3578712a12a905969 (patch)
treecda49f5e4169fe6261a5b3479ab2bb4a0f222bb1 /node-admin/src
parentc1b3fb8dce2b66857fb528da4d94ac96902e79f6 (diff)
Remove unused method and tests
Diffstat (limited to 'node-admin/src')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java8
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java35
2 files changed, 0 insertions, 43 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
index 9e6f7a25ed8..615eddac645 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
@@ -93,14 +93,6 @@ public class DockerOperationsImpl implements DockerOperations {
this.processExecuter = processExecuter;
}
- // Returns empty if vespa version cannot be parsed.
- static Optional<String> parseVespaVersion(final String rawVespaVersion) {
- if (rawVespaVersion == null) return Optional.empty();
-
- final Matcher matcher = VESPA_VERSION_PATTERN.matcher(rawVespaVersion.trim());
- return matcher.find() ? Optional.of(matcher.group(1)) : Optional.empty();
- }
-
@Override
public void startContainer(ContainerName containerName, final ContainerNodeSpec nodeSpec) {
PrefixLogger logger = PrefixLogger.getNodeAgentLogger(DockerOperationsImpl.class, containerName);
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 93f045efd9c..c0f123d7044 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
@@ -68,41 +68,6 @@ public class DockerOperationsImplTest {
}
@Test
- public void vespaVersionIsParsed() {
- assertThat(DockerOperationsImpl.parseVespaVersion("5.119.53"), CoreMatchers.is(Optional.of("5.119.53")));
- }
-
- @Test
- public void vespaVersionIsParsedWithSpacesAndNewlines() {
- assertThat(DockerOperationsImpl.parseVespaVersion("5.119.53\n"), CoreMatchers.is(Optional.of("5.119.53")));
- assertThat(DockerOperationsImpl.parseVespaVersion(" 5.119.53 \n"), CoreMatchers.is(Optional.of("5.119.53")));
- assertThat(DockerOperationsImpl.parseVespaVersion("\n 5.119.53 \n"), CoreMatchers.is(Optional.of("5.119.53")));
- }
-
- @Test
- public void vespaVersionIsParsedWithIrregularVersionScheme() {
- assertThat(DockerOperationsImpl.parseVespaVersion("7.2"), CoreMatchers.is(Optional.of("7.2")));
- assertThat(DockerOperationsImpl.parseVespaVersion("8.0-beta"), CoreMatchers.is(Optional.of("8.0-beta")));
- assertThat(DockerOperationsImpl.parseVespaVersion("foo"), CoreMatchers.is(Optional.of("foo")));
- assertThat(DockerOperationsImpl.parseVespaVersion("119"), CoreMatchers.is(Optional.of("119")));
- }
-
- @Test
- public void vespaVersionIsNotParsedFromNull() {
- assertThat(DockerOperationsImpl.parseVespaVersion(null), CoreMatchers.is(Optional.empty()));
- }
-
- @Test
- public void vespaVersionIsNotParsedFromEmptyString() {
- assertThat(DockerOperationsImpl.parseVespaVersion(""), CoreMatchers.is(Optional.empty()));
- }
-
- @Test
- public void vespaVersionIsNotParsedFromUnexpectedContent() {
- assertThat(DockerOperationsImpl.parseVespaVersion("No such command 'vespanodectl'"), CoreMatchers.is(Optional.empty()));
- }
-
- @Test
public void runsCommandInNetworkNamespace() {
Container container = makeContainer("container-42", Container.State.RUNNING, 42);