Update goss tests for pwb-code-server

rstudio · Sep 24, 2024 · 56cbcdd · 56cbcdd
1 parent 784d3f1
commit 56cbcdd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/workbench-for-google-cloud-workstations/test/goss.yaml b/workbench-for-google-cloud-workstations/test/goss.yaml
@@ -70,8 +70,11 @@ file:
     exists: true
     owner: rstudio-server
     group: rstudio-server
-  /usr/lib/rstudio-server/bin/code-server/bin/code-server:
+  /usr/lib/rstudio-server/bin/pwb-code-server/bin/code-server:
     exists: true
+  # Old code-server location
+  /usr/lib/rstudio-server/bin/code-server/bin/code-server:
+    exists: false
   /etc/rstudio/vscode.conf:
     exists: true
   /etc/rstudio/jupyter.conf:

diff --git a/workbench-for-microsoft-azure-ml/test/goss.yaml b/workbench-for-microsoft-azure-ml/test/goss.yaml
@@ -78,8 +78,11 @@ file:
     exists: true
     owner: rstudio-server
     group: rstudio-server
-  /usr/lib/rstudio-server/bin/code-server/bin/code-server:
+  /usr/lib/rstudio-server/bin/pwb-code-server/bin/code-server:
     exists: true
+  # Old code-server location
+  /usr/lib/rstudio-server/bin/code-server/bin/code-server:
+    exists: false
   /etc/rstudio/vscode.conf:
     exists: true
   /tmp/startup.log:

diff --git a/workbench/test/goss.yaml b/workbench/test/goss.yaml
@@ -69,14 +69,11 @@ file:
     exists: true
     owner: rstudio-server
     group: rstudio-server
-  {{ $version_split := split "." .Env.RSW_VERSION }}
-  {{ if or (ge ($version_split._0 | atoi) 2025) (and (ge ($version_split._0 | atoi) 2024) (ge ($version_split._1 | atoi) 7)) }}
   /usr/lib/rstudio-server/bin/pwb-code-server/bin/code-server:
     exists: true
-  {{ else }}
+  # Old code-server location
   /usr/lib/rstudio-server/bin/code-server/bin/code-server:
-    exists: true
-  {{ end }}
+    exists: false
   /var/lib/rstudio-launcher/Local/jobs/buildkitsandbox:
     exists: false
   /etc/rstudio/vscode.conf: