Fix more tests

OpenSlides · Oct 26, 2023 · c4ffa8e · c4ffa8e
1 parent c57cbf2
commit c4ffa8e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/openslides_backend/action/actions/motion/json_upload.py b/openslides_backend/action/actions/motion/json_upload.py
@@ -370,11 +370,11 @@ def validate_entry(self, entry: Dict[str, Any]) -> Dict[str, Any]:
         if (
             (text := entry.get("text"))
             and type(text) == str
-            and not search("/^<\\w+[^>]*>[\\w\\W]*?<\\/\\w>$/", text)
+            and not search(r"^<\w+[^>]*>[\w\W]*?<\/\w>$", text)
         ):
             entry["text"] = (
                 "<p>"
-                + sub("/\\n/g", "<br />", sub("/\\n([ \\t]*\\n)+/g", "</p><p>", text))
+                + sub(r"\n", "<br />", sub(r"\n([ \t]*\n)+", "</p><p>", text))
                 + "</p>"
             )
 
@@ -418,6 +418,12 @@ def validate_entry(self, entry: Dict[str, Any]) -> Dict[str, Any]:
             errors = self.get_create_payload_integrity_error_message(
                 payload, meeting_id
             )
+            if not (
+                self.row_state == ImportState.WARNING
+                or self.row_state == ImportState.ERROR
+            ):
+                motion_id = self.datastore.reserve_id("motion")
+                self.apply_instance(payload, "motion/" + str(motion_id))
 
         for err in errors:
             entry = self._add_error_to_entry(entry, err)

diff --git a/tests/system/action/motion/test_json_upload.py b/tests/system/action/motion/test_json_upload.py
@@ -319,7 +319,7 @@ def assert_dual_simple_create(
             "submitter_usernames": [{"id": 1, "info": "generated", "value": "admin"}],
         }
         if is_set_number:
-            data.update({"number": {"info": ImportState.GENERATED, "value": "2"}})
+            data.update({"number": {"info": ImportState.GENERATED, "value": "3"}})
         expected = {
             "state": ImportState.NEW,
             "messages": [],
@@ -334,7 +334,7 @@ def assert_dual_simple_create(
             "submitter_usernames": [{"id": 1, "info": "generated", "value": "admin"}],
         }
         if is_set_number:
-            data.update({"number": {"info": ImportState.GENERATED, "value": "3"}})
+            data.update({"number": {"info": ImportState.GENERATED, "value": "4"}})
         expected = {
             "state": ImportState.NEW,
             "messages": [],