WX-966 Post-merge branch cleanup + test fix (#7149)

broadinstitute · May 25, 2023 · c5d6151 · c5d6151
1 parent 28cdba7
commit c5d6151
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/...dTestCases/wdl_biscayne/biscayne_http_relative_imports/biscayne_http_relative_imports.wdl b/...dTestCases/wdl_biscayne/biscayne_http_relative_imports/biscayne_http_relative_imports.wdl
@@ -1,7 +1,7 @@
 version development-1.1
 
 # Is there a better way to test this?
-import "https://raw.githubusercontent.com/broadinstitute/cromwell/aen_wx_966/womtool/src/test/resources/validate/biscayne/valid/relative_imports/sub_wfs/foo.wdl"
+import "https://raw.githubusercontent.com/broadinstitute/cromwell/develop/womtool/src/test/resources/validate/biscayne/valid/relative_imports/sub_wfs/foo.wdl"
 
 workflow biscayne_http_relative_imports {
   call foo.foo_wf

diff --git a/services/src/test/resources/describe/wdl_1_0/relative_url_imports/description.json b/services/src/test/resources/describe/wdl_1_0/relative_url_imports/description.json
@@ -19,7 +19,7 @@
   ],
   "submittedDescriptorType" : {
     "descriptorType" : "WDL",
-    "descriptorTypeVersion" : "Cascades"
+    "descriptorTypeVersion" : "Biscayne"
   },
   "importedDescriptorTypes" : [
   ],

diff --git a/.../test/resources/validate-with-imports/biscayne/http_relative_imports/expected_imports.txt b/.../test/resources/validate-with-imports/biscayne/http_relative_imports/expected_imports.txt
@@ -1,5 +1,5 @@
 Success!
 List of Workflow dependencies is:
-https://raw.githubusercontent.com/broadinstitute/cromwell/aen_wx_966/womtool/src/test/resources/validate/biscayne/valid/relative_imports/structs/my_struct.wdl
-https://raw.githubusercontent.com/broadinstitute/cromwell/aen_wx_966/womtool/src/test/resources/validate/biscayne/valid/relative_imports/sub_wfs/tasks/add5.wdl
-https://raw.githubusercontent.com/broadinstitute/cromwell/aen_wx_966/womtool/src/test/resources/validate/biscayne/valid/relative_imports/sub_wfs/foo.wdl
+https://raw.githubusercontent.com/broadinstitute/cromwell/develop/womtool/src/test/resources/validate/biscayne/valid/relative_imports/structs/my_struct.wdl
+https://raw.githubusercontent.com/broadinstitute/cromwell/develop/womtool/src/test/resources/validate/biscayne/valid/relative_imports/sub_wfs/tasks/add5.wdl
+https://raw.githubusercontent.com/broadinstitute/cromwell/develop/womtool/src/test/resources/validate/biscayne/valid/relative_imports/sub_wfs/foo.wdl
diff --git a/...rc/test/resources/validate/biscayne/valid/http_relative_imports/http_relative_imports.wdl b/...rc/test/resources/validate/biscayne/valid/http_relative_imports/http_relative_imports.wdl
@@ -1,7 +1,7 @@
 version development-1.1
 
 # Is there a better way to test this?
-import "https://raw.githubusercontent.com/broadinstitute/cromwell/aen_wx_966/womtool/src/test/resources/validate/biscayne/valid/relative_imports/sub_wfs/foo.wdl"
+import "https://raw.githubusercontent.com/broadinstitute/cromwell/develop/womtool/src/test/resources/validate/biscayne/valid/relative_imports/sub_wfs/foo.wdl"
 
 workflow http_relative_imports {
   call foo.foo_wf