Merge branch 'release_23.2' into dev

galaxyproject · Mar 4, 2024 · 075ad21 · 075ad21
2 parents 89db9c2 + 5ff2481
commit 075ad21
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
@@ -949,7 +949,7 @@ def adjust_total_disk_usage(self, amount, quota_source_label):
         assert amount is not None
         if amount != 0:
             if quota_source_label is None:
-                self.disk_usage = func.coalesce(self.table.c.disk_usage, 0) + amount
+                self.disk_usage = (self.disk_usage or 0) + amount
             else:
                 # else would work on newer sqlite - 3.24.0
                 engine = object_session(self).bind

diff --git a/test/integration/test_page_revision_json_encoding.py b/test/integration/test_page_revision_json_encoding.py
@@ -5,6 +5,8 @@
 exported API values are encoded though.
 """
 
+import re
+
 from sqlalchemy import select
 
 from galaxy import model
@@ -21,6 +23,7 @@ def setUp(self):
         self.dataset_populator = DatasetPopulator(self.galaxy_interactor)
 
     def test_page_encoding(self, history_id: str):
+        history_num_re = re.compile(r'id="History-\d+"')
         request = dict(
             slug="mypage",
             title="MY PAGE",
@@ -30,13 +33,13 @@ def test_page_encoding(self, history_id: str):
         api_asserts.assert_status_code_is_ok(page_response)
         sa_session = self._app.model.session
         page_revision = sa_session.scalars(select(model.PageRevision).filter_by(content_format="html")).all()[0]
-        assert '''id="History-1"''' in page_revision.content, page_revision.content
+        assert history_num_re.search(page_revision.content), page_revision.content
         assert f'''id="History-{history_id}"''' not in page_revision.content, page_revision.content
 
         show_page_response = self._get("pages/{}".format(page_response.json()["id"]))
         api_asserts.assert_status_code_is_ok(show_page_response)
         content = show_page_response.json()["content"]
-        assert '''id="History-1"''' not in content, content
+        assert not history_num_re.search(content), content
         assert f'''id="History-{history_id}"''' in content, content
 
     def test_page_encoding_markdown(self, history_id: str):

diff --git a/test/integration/test_workflow_scheduling_options.py b/test/integration/test_workflow_scheduling_options.py
@@ -90,7 +90,7 @@ def test_collection_explicit_and_implicit(self):
             inputs = {
                 "0": {"src": "hdca", "id": hdca1["id"]},
             }
-            self.workflow_populator.invoke_workflow_and_wait(history_id, workflow_id, inputs)
+            self.workflow_populator.invoke_workflow_and_wait(workflow_id, history_id, inputs)
             self.dataset_populator.wait_for_history(history_id, assert_ok=True)
             assert "a\nc\nb\nd\ne\ng\nf\nh\n" == self.dataset_populator.get_history_dataset_content(history_id, hid=0)