Fixed integration tests (#990)

dhoard · web-flow · commit 88fbe7304229 · 2024-08-08T13:37:30.000-04:00
Signed-off-by: dhoard &lt;doug.hoard@gmail.com&gt;
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/AutoIncrementingMBeanTest/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/AutoIncrementingMBeanTest/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/BlacklistObjectNamesTest/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/BlacklistObjectNamesTest/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/CompositeKeyDataTest/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/CompositeKeyDataTest/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/DisableAutoExcludeObjectNameAttributesTest/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/DisableAutoExcludeObjectNameAttributesTest/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/ExcludeObjectNameAttributesTest/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/ExcludeObjectNameAttributesTest/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/ExcludeObjectNamesTest/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/ExcludeObjectNamesTest/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/IncludeAndExcludeObjectNamesTest/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/IncludeAndExcludeObjectNamesTest/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/IncludeObjectNamesTest/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/IncludeObjectNamesTest/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/LowerCaseOutputAndLabelNamesTest/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/LowerCaseOutputAndLabelNamesTest/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/LowerCaseOutputLabelNamesTest/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/LowerCaseOutputLabelNamesTest/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/LowerCaseOutputNamesTest/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/LowerCaseOutputNamesTest/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/MinimalTest/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/MinimalTest/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/OptionalValueMBeanTest/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/OptionalValueMBeanTest/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/WhitelistAndBlacklistObjectNamesTest/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/WhitelistAndBlacklistObjectNamesTest/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/WhitelistObjectNamesTest/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/WhitelistObjectNamesTest/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/CompleteHttpServerConfigurationTest/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/CompleteHttpServerConfigurationTest/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/authentication/BasicAuthenticationPBKDF2WithHmacSHA1Test/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/authentication/BasicAuthenticationPBKDF2WithHmacSHA1Test/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/authentication/BasicAuthenticationPBKDF2WithHmacSHA256Test/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/authentication/BasicAuthenticationPBKDF2WithHmacSHA256Test/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/authentication/BasicAuthenticationPBKDF2WithHmacSHA512Test/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/authentication/BasicAuthenticationPBKDF2WithHmacSHA512Test/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/authentication/BasicAuthenticationPlaintextTest/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/authentication/BasicAuthenticationPlaintextTest/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/authentication/BasicAuthenticationSHA1Test/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/authentication/BasicAuthenticationSHA1Test/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/authentication/BasicAuthenticationSHA256Test/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/authentication/BasicAuthenticationSHA256Test/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/authentication/BasicAuthenticationSHA512Test/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/authentication/BasicAuthenticationSHA512Test/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/ssl/SSLAndBasicAuthenticationPBKDF2WithHmacSHA512Test/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/ssl/SSLAndBasicAuthenticationPBKDF2WithHmacSHA512Test/Standalone/exporter.sh
@@ -4,4 +4,4 @@ java \
   -Xmx512M \
   -Djavax.net.ssl.keyStore=localhost.jks \
   -Djavax.net.ssl.keyStorePassword=changeit \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/ssl/SSLWithJKSKeyStoreMultipleCertificatesTest/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/ssl/SSLWithJKSKeyStoreMultipleCertificatesTest/Standalone/exporter.sh
@@ -4,4 +4,4 @@ java \
   -Xmx512M \
   -Djavax.net.ssl.keyStore=localhost.jks \
   -Djavax.net.ssl.keyStorePassword=changeit \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/ssl/SSLWithJKSKeyStoreTest/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/ssl/SSLWithJKSKeyStoreTest/Standalone/exporter.sh
@@ -4,4 +4,4 @@ java \
   -Xmx512M \
   -Djavax.net.ssl.keyStore=localhost.jks \
   -Djavax.net.ssl.keyStorePassword=changeit \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/ssl/SSLWithJKSKeyStoreTest2/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/ssl/SSLWithJKSKeyStoreTest2/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/ssl/SSLWithPKCS12KeyStoreMultipleCertificatesTest/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/ssl/SSLWithPKCS12KeyStoreMultipleCertificatesTest/Standalone/exporter.sh
@@ -4,4 +4,4 @@ java \
   -Xmx512M \
   -Djavax.net.ssl.keyStore=localhost.pkcs12 \
   -Djavax.net.ssl.keyStorePassword=changeit \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/ssl/SSLWithPKCS12KeyStoreTest/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/ssl/SSLWithPKCS12KeyStoreTest/Standalone/exporter.sh
@@ -4,4 +4,4 @@ java \
   -Xmx512M \
   -Djavax.net.ssl.keyStore=localhost.pkcs12 \
   -Djavax.net.ssl.keyStorePassword=changeit \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/ssl/SSLWithPKCS12KeyStoreTest2/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/ssl/SSLWithPKCS12KeyStoreTest2/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/threads/ThreadsConfigurationTest/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/http/threads/ThreadsConfigurationTest/Standalone/exporter.sh
@@ -2,4 +2,4 @@
 
 java \
   -Xmx512M \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/rmi/ssl/MinimalRMISSLTest/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/rmi/ssl/MinimalRMISSLTest/Standalone/exporter.sh
@@ -8,4 +8,4 @@ java \
   -Djavax.net.ssl.trustStore=localhost.pkcs12 \
   -Djavax.net.ssl.trustStorePassword=changeit \
   -Djavax.net.ssl.trustStoreType=pkcs12 \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
diff --git a/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/rmi/ssl/RMIRegistrySSLDisabledTest/Standalone/exporter.sh b/integration_test_suite/integration_tests/src/test/resources/io/prometheus/jmx/test/rmi/ssl/RMIRegistrySSLDisabledTest/Standalone/exporter.sh
@@ -10,4 +10,4 @@ java \
   -Djavax.net.ssl.trustStore=localhost.pkcs12 \
   -Djavax.net.ssl.trustStorePassword=changeit \
   -Djavax.net.ssl.trustStoreType=pkcs12 \
-  -jar jmx_prometheus_standalone.jar 8888 exporter.yaml
+  -jar jmx_prometheus_httpserver.jar 8888 exporter.yaml
