Rearrange test_objectstore for consistency.

galaxyproject · Dec 7, 2020 · 2a8418d · 2a8418d
1 parent 7cccf3a
commit 2a8418d
Showing 1 changed file with 18 additions and 17 deletions.
diff --git a/test/unit/objectstore/test_objectstore.py b/test/unit/objectstore/test_objectstore.py
@@ -177,23 +177,6 @@ def test_disk_store_alt_name_abspath():
             pass
 
 
-MIXED_STORE_BY_HIERARCHICAL_TEST_CONFIG = """<?xml version="1.0"?>
-<object_store type="hierarchical">
-    <backends>
-        <backend id="files1" type="disk" weight="1" order="0" store_by="id">
-            <files_dir path="${temp_directory}/files1"/>
-            <extra_dir type="temp" path="${temp_directory}/tmp1"/>
-            <extra_dir type="job_work" path="${temp_directory}/job_working_directory1"/>
-        </backend>
-        <backend id="files2" type="disk" weight="1" order="1" store_by="uuid">
-            <files_dir path="${temp_directory}/files2"/>
-            <extra_dir type="temp" path="${temp_directory}/tmp2"/>
-            <extra_dir type="job_work" path="${temp_directory}/job_working_directory2"/>
-        </backend>
-    </backends>
-</object_store>
-"""
-
 HIERARCHICAL_TEST_CONFIG = """<?xml version="1.0"?>
 <object_store type="hierarchical">
     <backends>
@@ -290,6 +273,24 @@ def test_hierarchical_store():
             _assert_key_has_value(as_dict, "type", "hierarchical")
 
 
+MIXED_STORE_BY_HIERARCHICAL_TEST_CONFIG = """<?xml version="1.0"?>
+<object_store type="hierarchical">
+    <backends>
+        <backend id="files1" type="disk" weight="1" order="0" store_by="id">
+            <files_dir path="${temp_directory}/files1"/>
+            <extra_dir type="temp" path="${temp_directory}/tmp1"/>
+            <extra_dir type="job_work" path="${temp_directory}/job_working_directory1"/>
+        </backend>
+        <backend id="files2" type="disk" weight="1" order="1" store_by="uuid">
+            <files_dir path="${temp_directory}/files2"/>
+            <extra_dir type="temp" path="${temp_directory}/tmp2"/>
+            <extra_dir type="job_work" path="${temp_directory}/job_working_directory2"/>
+        </backend>
+    </backends>
+</object_store>
+"""
+
+
 def test_mixed_store_by():
     with TestConfig(MIXED_STORE_BY_HIERARCHICAL_TEST_CONFIG) as (directory, object_store):
         as_dict = object_store.to_dict()