Merge pull request #784 from rstudio/update-workbench-2024.7-tests

Update Workbench tests for >=2024.7 preview compatibility
rstudio · May 30, 2024 · c635200 · c635200
2 parents c69133c + 10d4acc
commit c635200
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/r-session-complete/test/goss.yaml b/r-session-complete/test/goss.yaml
@@ -6,8 +6,8 @@ file:
   /usr/local/bin/jupyter:
     exists: true
   {{ $version_split := split "." .Env.RSW_VERSION }}
-  {{ if or (lt ($version_split._0 | atoi) 2022) (and (eq ($version_split._0 | atoi) 2022) (lt ($version_split._1 | atoi) 12)) }}
-  /opt/code-server/bin/code-server:
+  {{ 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 }}
   /usr/lib/rstudio-server/bin/code-server/bin/code-server:

diff --git a/workbench/test/goss.yaml b/workbench/test/goss.yaml
@@ -70,8 +70,8 @@ file:
     owner: rstudio-server
     group: rstudio-server
   {{ $version_split := split "." .Env.RSW_VERSION }}
-  {{ if or (lt ($version_split._0 | atoi) 2022) (and (eq ($version_split._0 | atoi) 2022) (lt ($version_split._1 | atoi) 12)) }}
-  /opt/code-server/bin/code-server:
+  {{ 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 }}
   /usr/lib/rstudio-server/bin/code-server/bin/code-server: