Ref #32380: improve tests

openanalytics · Feb 22, 2024 · 386bca2 · 386bca2
1 parent 7a7e845
commit 386bca2
Show file tree

Hide file tree

Showing 22 changed files with 50 additions and 42 deletions.
diff --git a/.github/workflows/workflows.yaml b/.github/workflows/workflows.yaml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 11 ]
+        java: [ 17 ]
         kubernetes:
           - 'v1.24.17'
           - 'v1.25.15'
@@ -35,9 +35,10 @@ jobs:
           minikube version: 'v1.32.0'
           kubernetes version:  ${{ matrix.kubernetes }}
           github token: ${{ secrets.GITHUB_TOKEN }}
+          driver: docker
       - name: Pull images
         run: |
-          minikube image pull openanalytics/shinyproxy-demo
+          minikube image pull openanalytics/shinyproxy-integration-test-app
           minikube image pull curlimages/curl:latest
       - name: Build with Maven
         run: mvn -B -U clean install -DskipTests

diff --git a/docs/deployment/overlays/2-clustered/shinyproxy-dept2/resources/shinyproxy.shinyproxy.yaml b/docs/deployment/overlays/2-clustered/shinyproxy-dept2/resources/shinyproxy.shinyproxy.yaml
@@ -42,11 +42,11 @@ spec:
         display-name: Hello Application
         description: Application which demonstrates the basics of a Shiny app
         container-cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
-        container-image: openanalytics/shinyproxy-demo
+        container-image: openanalytics/shinyproxy-integration-test-app
         access-groups: [scientists, mathematicians]
       - id: 06_tabsets
         container-cmd: ["R", "-e", "shinyproxy::run_06_tabsets()"]
-        container-image: openanalytics/shinyproxy-demo
+        container-image: openanalytics/shinyproxy-integration-test-app
         access-groups: scientists
       - id: rstudio
         displayName: RStudio

diff --git a/docs/deployment/overlays/2-clustered/shinyproxy/resources/shinyproxy.shinyproxy.yaml b/docs/deployment/overlays/2-clustered/shinyproxy/resources/shinyproxy.shinyproxy.yaml
@@ -42,11 +42,11 @@ spec:
         display-name: Hello Application
         description: Application which demonstrates the basics of a Shiny app
         container-cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
-        container-image: openanalytics/shinyproxy-demo
+        container-image: openanalytics/shinyproxy-integration-test-app
         access-groups: [scientists, mathematicians]
       - id: 06_tabsets
         container-cmd: ["R", "-e", "shinyproxy::run_06_tabsets()"]
-        container-image: openanalytics/shinyproxy-demo
+        container-image: openanalytics/shinyproxy-integration-test-app
         access-groups: scientists
       - id: rstudio
         displayName: RStudio

diff --git a/docs/deployment/overlays/3-namespaced-app-ns/shinyproxy/resources/shinyproxy.shinyproxy.yaml b/docs/deployment/overlays/3-namespaced-app-ns/shinyproxy/resources/shinyproxy.shinyproxy.yaml
@@ -43,15 +43,15 @@ spec:
         display-name: Hello Application
         description: Application which demonstrates the basics of a Shiny app
         container-cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
-        container-image: openanalytics/shinyproxy-demo
+        container-image: openanalytics/shinyproxy-integration-test-app
         access-groups: [ scientists, mathematicians ]
         kubernetes-pod-patches: |
           - op: replace
             path: /metadata/namespace
             value: my-namespace
       - id: 06_tabsets
         container-cmd: ["R", "-e", "shinyproxy::run_06_tabsets()"]
-        container-image: openanalytics/shinyproxy-demo
+        container-image: openanalytics/shinyproxy-integration-test-app
         access-groups: scientists
       - id: rstudio
         displayName: RStudio

diff --git a/docs/deployment/overlays/4-namespaced-multi/resources/shinyproxy1.shinyproxy.yaml b/docs/deployment/overlays/4-namespaced-multi/resources/shinyproxy1.shinyproxy.yaml
@@ -45,11 +45,11 @@ spec:
         display-name: Hello Application
         description: Application which demonstrates the basics of a Shiny app
         container-cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
-        container-image: openanalytics/shinyproxy-demo
+        container-image: openanalytics/shinyproxy-integration-test-app
         access-groups: [scientists, mathematicians]
       - id: 06_tabsets
         container-cmd: ["R", "-e", "shinyproxy::run_06_tabsets()"]
-        container-image: openanalytics/shinyproxy-demo
+        container-image: openanalytics/shinyproxy-integration-test-app
         access-groups: scientists
       - id: rstudio
         displayName: RStudio

diff --git a/docs/deployment/overlays/4-namespaced-multi/resources/shinyproxy2.shinyproxy.yaml b/docs/deployment/overlays/4-namespaced-multi/resources/shinyproxy2.shinyproxy.yaml
@@ -46,11 +46,11 @@ spec:
         display-name: Hello Application
         description: Application which demonstrates the basics of a Shiny app
         container-cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
-        container-image: openanalytics/shinyproxy-demo
+        container-image: openanalytics/shinyproxy-integration-test-app
         access-groups: [scientists, mathematicians]
       - id: 06_tabsets
         container-cmd: ["R", "-e", "shinyproxy::run_06_tabsets()"]
-        container-image: openanalytics/shinyproxy-demo
+        container-image: openanalytics/shinyproxy-integration-test-app
         access-groups: scientists
       - id: rstudio
         displayName: RStudio

diff --git a/docs/deployment/overlays/4-namespaced-multi/resources/shinyproxy3.shinyproxy.yaml b/docs/deployment/overlays/4-namespaced-multi/resources/shinyproxy3.shinyproxy.yaml
@@ -46,11 +46,11 @@ spec:
         display-name: Hello Application
         description: Application which demonstrates the basics of a Shiny app
         container-cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
-        container-image: openanalytics/shinyproxy-demo
+        container-image: openanalytics/shinyproxy-integration-test-app
         access-groups: [scientists, mathematicians]
       - id: 06_tabsets
         container-cmd: ["R", "-e", "shinyproxy::run_06_tabsets()"]
-        container-image: openanalytics/shinyproxy-demo
+        container-image: openanalytics/shinyproxy-integration-test-app
         access-groups: scientists
       - id: rstudio
         displayName: RStudio

diff --git a/src/test/kotlin/eu/openanalytics/shinyproxyoperator/helpers/MockRecyclablecheckler.kt b/src/test/kotlin/eu/openanalytics/shinyproxyoperator/helpers/MockRecyclablecheckler.kt
@@ -30,7 +30,7 @@ class MockRecyclableChecker : IRecyclableChecker {
     @Volatile
     var isRecyclable: Boolean = false
 
-    override fun isInstanceRecyclable(shinyProxy: ShinyProxy, shinyProxyInstance: ShinyProxyInstance): Boolean {
+    override suspend fun isInstanceRecyclable(shinyProxy: ShinyProxy, shinyProxyInstance: ShinyProxyInstance): Boolean {
         return isRecyclable
     }
 

diff --git a/src/test/kotlin/eu/openanalytics/shinyproxyoperator/helpers/junit/TestExecutionListener.kt b/src/test/kotlin/eu/openanalytics/shinyproxyoperator/helpers/junit/TestExecutionListener.kt
@@ -29,7 +29,9 @@ class TestExecutionListener : SummaryGeneratingListener() {
 
     init {
         Runtime.getRuntime().addShutdownHook(Thread {
-            summary.printTo(PrintWriter(System.out))
+            if (summary != null) {
+                summary.printTo(PrintWriter(System.out))
+            }
         })
     }
 
@@ -57,7 +59,10 @@ class TestExecutionListener : SummaryGeneratingListener() {
 
         println()
         println("\t\t--> Finished test \"${testIdentifier.displayName}\": $testExecutionResult")
+        if (testExecutionResult.throwable.isPresent) {
+            testExecutionResult.throwable.get().printStackTrace()
+        }
         println()
     }
 
-}
+}
diff --git a/src/test/resources/configs/additional_fqdns.yaml b/src/test/resources/configs/additional_fqdns.yaml
@@ -30,7 +30,7 @@ spec:
         displayName: Hello Application
         description: Application which demonstrates the basics of a Shiny app
         containerCmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
-        containerImage: openanalytics/shinyproxy-demo
+        containerImage: openanalytics/shinyproxy-integration-test-app
       - id: 06_tabsets
         container-cmd: [ "R", "-e", "shinyproxy::run_06_tabsets()" ]
-        container-image: openanalytics/shinyproxy-demo
+        container-image: openanalytics/shinyproxy-integration-test-app
diff --git a/src/test/resources/configs/affinity_required.yaml b/src/test/resources/configs/affinity_required.yaml
@@ -29,7 +29,7 @@ spec:
         displayName: Hello Application
         description: Application which demonstrates the basics of a Shiny app
         containerCmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
-        containerImage: openanalytics/shinyproxy-demo
+        containerImage: openanalytics/shinyproxy-integration-test-app
       - id: 06_tabsets
         container-cmd: [ "R", "-e", "shinyproxy::run_06_tabsets()" ]
-        container-image: openanalytics/shinyproxy-demo
+        container-image: openanalytics/shinyproxy-integration-test-app
diff --git a/src/test/resources/configs/affinity_topologykey.yaml b/src/test/resources/configs/affinity_topologykey.yaml
@@ -29,7 +29,7 @@ spec:
         displayName: Hello Application
         description: Application which demonstrates the basics of a Shiny app
         containerCmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
-        containerImage: openanalytics/shinyproxy-demo
+        containerImage: openanalytics/shinyproxy-integration-test-app
       - id: 06_tabsets
         container-cmd: [ "R", "-e", "shinyproxy::run_06_tabsets()" ]
-        container-image: openanalytics/shinyproxy-demo
+        container-image: openanalytics/shinyproxy-integration-test-app
diff --git a/src/test/resources/configs/conflict.yaml b/src/test/resources/configs/conflict.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: sp-example-shinyproxy-cm-f5b84adc3f917d9256a0c779fd53080f13033e
+  name: sp-example-shinyproxy-cm-a2460e4e35bfd14f72413e02ac6acfd0d33d7e
   namespace: itest
 data:
   application.yml: |

diff --git a/src/test/resources/configs/simple_config.yaml b/src/test/resources/configs/simple_config.yaml
@@ -15,6 +15,7 @@ spec:
     authentication: simple
     containerBackend: kubernetes
     stop-proxies-on-shutdown: false
+    default-stop-proxy-on-logout: false
     kubernetes:
       namespace: itest
       internal-networking: true
@@ -30,7 +31,7 @@ spec:
         displayName: Hello Application
         description: Application which demonstrates the basics of a Shiny app
         containerCmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
-        containerImage: openanalytics/shinyproxy-demo
+        containerImage: openanalytics/shinyproxy-integration-test-app
       - id: 06_tabsets
         container-cmd: [ "R", "-e", "shinyproxy::run_06_tabsets()" ]
-        container-image: openanalytics/shinyproxy-demo
+        container-image: openanalytics/shinyproxy-integration-test-app
diff --git a/src/test/resources/configs/simple_config_clustered.yaml b/src/test/resources/configs/simple_config_clustered.yaml
@@ -28,7 +28,7 @@ spec:
         displayName: Hello Application
         description: Application which demonstrates the basics of a Shiny app
         containerCmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
-        containerImage: openanalytics/shinyproxy-demo
+        containerImage: openanalytics/shinyproxy-integration-test-app
       - id: 06_tabsets
         container-cmd: [ "R", "-e", "shinyproxy::run_06_tabsets()" ]
-        container-image: openanalytics/shinyproxy-demo
+        container-image: openanalytics/shinyproxy-integration-test-app
diff --git a/src/test/resources/configs/simple_config_multiple_namespaces.yaml b/src/test/resources/configs/simple_config_multiple_namespaces.yaml
@@ -28,13 +28,13 @@ spec:
         displayName: Hello Application
         description: Application which demonstrates the basics of a Shiny app
         containerCmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
-        containerImage: openanalytics/shinyproxy-demo
+        containerImage: openanalytics/shinyproxy-integration-test-app
         kubernetes-pod-patches: |
           - op: replace
             path: /metadata/namespace
             value: my-namespace
       - id: 06_tabsets
         container-cmd: [ "R", "-e", "shinyproxy::run_06_tabsets()" ]
-        container-image: openanalytics/shinyproxy-demo
+        container-image: openanalytics/shinyproxy-integration-test-app
   appNamespaces:
     - my-namespace
diff --git a/src/test/resources/configs/simple_config_subpath1.yaml b/src/test/resources/configs/simple_config_subpath1.yaml
@@ -28,10 +28,10 @@ spec:
         displayName: Hello Application
         description: Application which demonstrates the basics of a Shiny app
         containerCmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
-        containerImage: openanalytics/shinyproxy-demo
+        containerImage: openanalytics/shinyproxy-integration-test-app
       - id: 06_tabsets
         container-cmd: [ "R", "-e", "shinyproxy::run_06_tabsets()" ]
-        container-image: openanalytics/shinyproxy-demo
+        container-image: openanalytics/shinyproxy-integration-test-app
   server:
     servlet:
       context-path: /sub-path
diff --git a/src/test/resources/configs/simple_config_subpath2.yaml b/src/test/resources/configs/simple_config_subpath2.yaml
@@ -28,10 +28,10 @@ spec:
         displayName: Hello Application
         description: Application which demonstrates the basics of a Shiny app
         containerCmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
-        containerImage: openanalytics/shinyproxy-demo
+        containerImage: openanalytics/shinyproxy-integration-test-app
       - id: 06_tabsets
         container-cmd: [ "R", "-e", "shinyproxy::run_06_tabsets()" ]
-        container-image: openanalytics/shinyproxy-demo
+        container-image: openanalytics/shinyproxy-integration-test-app
   server:
     servlet:
       context-path: /sub-path/
diff --git a/src/test/resources/configs/simple_config_updated.yaml b/src/test/resources/configs/simple_config_updated.yaml
@@ -15,6 +15,7 @@ spec:
     authentication: simple
     containerBackend: kubernetes
     stop-proxies-on-shutdown: false
+    default-stop-proxy-on-logout: false
     kubernetes:
       namespace: itest
       internal-networking: true
@@ -30,7 +31,7 @@ spec:
         displayName: Hello Application
         description: Application which demonstrates the basics of a Shiny app
         containerCmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
-        containerImage: openanalytics/shinyproxy-demo
+        containerImage: openanalytics/shinyproxy-integration-test-app
       - id: 06_tabsets
         container-cmd: [ "R", "-e", "shinyproxy::run_06_tabsets()" ]
-        container-image: openanalytics/shinyproxy-demo
+        container-image: openanalytics/shinyproxy-integration-test-app
diff --git a/src/test/resources/configs/simple_config_with_ingress_patches.yaml b/src/test/resources/configs/simple_config_with_ingress_patches.yaml
@@ -28,10 +28,10 @@ spec:
         displayName: Hello Application
         description: Application which demonstrates the basics of a Shiny app
         containerCmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
-        containerImage: openanalytics/shinyproxy-demo
+        containerImage: openanalytics/shinyproxy-integration-test-app
       - id: 06_tabsets
         container-cmd: [ "R", "-e", "shinyproxy::run_06_tabsets()" ]
-        container-image: openanalytics/shinyproxy-demo
+        container-image: openanalytics/shinyproxy-integration-test-app
   kubernetesIngressPatches: |
     - op: add
       path: /metadata/annotations

diff --git a/src/test/resources/configs/simple_config_with_patches.yaml b/src/test/resources/configs/simple_config_with_patches.yaml
@@ -28,10 +28,10 @@ spec:
         displayName: Hello Application
         description: Application which demonstrates the basics of a Shiny app
         containerCmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
-        containerImage: openanalytics/shinyproxy-demo
+        containerImage: openanalytics/shinyproxy-integration-test-app
       - id: 06_tabsets
         container-cmd: [ "R", "-e", "shinyproxy::run_06_tabsets()" ]
-        container-image: openanalytics/shinyproxy-demo
+        container-image: openanalytics/shinyproxy-integration-test-app
   kubernetesPodTemplateSpecPatches: |
     - op: add
       path: /spec/containers/0/env/-

diff --git a/src/test/resources/configs/simple_config_with_service_patches.yaml b/src/test/resources/configs/simple_config_with_service_patches.yaml
@@ -28,10 +28,10 @@ spec:
         displayName: Hello Application
         description: Application which demonstrates the basics of a Shiny app
         containerCmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
-        containerImage: openanalytics/shinyproxy-demo
+        containerImage: openanalytics/shinyproxy-integration-test-app
       - id: 06_tabsets
         container-cmd: [ "R", "-e", "shinyproxy::run_06_tabsets()" ]
-        container-image: openanalytics/shinyproxy-demo
+        container-image: openanalytics/shinyproxy-integration-test-app
   kubernetesServicePatches: |
     - op: add
       path: /metadata/annotations