move testdef.store outside import

wcs/admin/tests.py

@@ -443,6 +443,7 @@ class TestsDirectory(Directory):
             form.set_error('file', _('Invalid File'))
             raise e
 
+        testdef.store()
         get_session().message = ('info', _('Test "%s" has been successfully imported.') % testdef.name)
         return redirect('.')
 

wcs/formdef.py

@@ -1750,6 +1750,7 @@ class FormDef(StorableObject):
 
         for testdef in self.xml_testdefs:
             TestDef.import_from_xml_tree(testdef, self)
+            testdef.store()
 
     def get_detailed_email_form(self, formdata, url):
         r = ''

wcs/testdef.py

@@ -166,6 +166,12 @@ class TestDef(sql.TestDef):
         self.workflow_tests.testdef = self
         self.workflow_tests.store()
 
+        # first store after import, attach webservice responses
+        if hasattr(self, '_webservice_responses'):
+            for response in self._webservice_responses:
+                response.testdef_id = self.id
+                response.store()
+
     @classmethod
     def remove_object(cls, id):
         super().remove_object(id)
@@ -541,12 +547,6 @@ class TestDef(sql.TestDef):
             if hasattr(testdef_xml, field):
                 setattr(testdef, field, getattr(testdef_xml, field))
 
-        testdef.store()
-
-        for response in testdef._webservice_responses:
-            response.testdef_id = testdef.id
-            response.store()
-
         return testdef