Merge pull request #17922 from vespa-engine/bjorncs/vespa-feed-client

Bjorncs/vespa feed client

3 files changed, 2 insertions, 40 deletions

diff --git a/vespa-feed-client/src/main/java/ai/vespa/feed/client/CliArguments.java b/vespa-feed-client/src/main/java/ai/vespa/feed/client/CliArguments.java
index e0ceb9b22ce..63b438134d6 100644
--- a/vespa-feed-client/src/main/java/ai/vespa/feed/client/CliArguments.java
+++ b/vespa-feed-client/src/main/java/ai/vespa/feed/client/CliArguments.java
@@ -172,7 +172,7 @@ class CliArguments {
                 writer,
                 formatter.getWidth(),
                 "vespa-feed-client <options>",
-                "Vespa feed client (" + Vespa.VERSION + ")",
+                "Vespa feed client",
                 optionsDefinition,
                 formatter.getLeftPadding(),
                 formatter.getDescPadding(),
diff --git a/vespa-feed-client/src/test/java/ai/vespa/feed/client/HttpRequestStrategyTest.java b/vespa-feed-client/src/test/java/ai/vespa/feed/client/HttpRequestStrategyTest.java
deleted file mode 100644
index a643783bd46..00000000000
--- a/vespa-feed-client/src/test/java/ai/vespa/feed/client/HttpRequestStrategyTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package ai.vespa.feed.client;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import java.time.Duration;
-import java.time.Instant;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
-
-class HttpRequestStrategyTest {
-
-    @Test
-    void test() throws InterruptedException {
-        AtomicLong c = new AtomicLong();
-        class Counter {
-            long d;
-            synchronized long next() { return ++d; }
-        }
-        Counter d = new Counter();
-        int n = 2;
-        ExecutorService executor = Executors.newFixedThreadPool(n);
-        Instant now = Instant.now();
-        for (int i = 0; i < n; i++) {
-            executor.submit(() -> {
-                //while (c.incrementAndGet() < 1e8);
-                //while (d.next() < 1e8);
-            });
-        }
-        executor.shutdown();
-        executor.awaitTermination(1, TimeUnit.DAYS);
-        Assertions.fail("ms: " + Duration.between(now, Instant.now()).toMillis());
-    };
-
-}
diff --git a/vespa-feed-client/src/test/resources/help.txt b/vespa-feed-client/src/test/resources/help.txt
index 14cd856e12a..d0017003a11 100644
--- a/vespa-feed-client/src/test/resources/help.txt
+++ b/vespa-feed-client/src/test/resources/help.txt
@@ -1,5 +1,5 @@
 usage: vespa-feed-client <options>
-Vespa feed client (7.164.0)
+Vespa feed client
     --ca-certificates <arg>
     --certificate <arg>
     --connections <arg>