Drop support for skiptest attribute on xml files
issue8735 review270351002
This commit is contained in:
1 parent
5f49ca09a7
commit
bc0c6f13f9
5 files changed
+2
-18
No files matched your search
@@ -1,3 +1,4 @@
|
||||
* Drop support for skiptest attribute on xml files
|
||||
* Remove implicit field names in ModelStorage.search_read
|
||||
|
||||
Version 5.4.0 - 2019-11-04
|
||||
|
||||
@@ -115,7 +115,6 @@ Here is the list of the tags:
|
||||
attributes:
|
||||
|
||||
* ``noupdate`` to prevent the framework to update the records,
|
||||
* ``skiptest`` to prevent import of data when running tests,
|
||||
* ``depends`` to import data only if all modules in the comma separated
|
||||
module list value are installed,
|
||||
* ``grouped`` to create records at the end with a grouped call.
|
||||
|
||||
+1
-5
@@ -472,11 +472,7 @@ class TrytondXmlHandler(sax.handler.ContentHandler):
|
||||
elif name == "data":
|
||||
self.noupdate = bool(int(attributes.get("noupdate", '0')))
|
||||
self.grouped = bool(int(attributes.get('grouped', 0)))
|
||||
if self.pool.test and \
|
||||
bool(int(attributes.get("skiptest", '0'))):
|
||||
self.skip_data = True
|
||||
else:
|
||||
self.skip_data = False
|
||||
self.skip_data = False
|
||||
depends = attributes.get('depends', '').split(',')
|
||||
depends = {m.strip() for m in depends if m}
|
||||
if not depends.issubset(self.modules):
|
||||
|
||||
@@ -8,7 +8,6 @@ attlist.data &=
|
||||
attlist.data &=
|
||||
[ a:defaultValue = "0" ] attribute grouped { "0" | "1" }?
|
||||
attlist.data &= attribute depends { text }?
|
||||
attlist.data &= attribute skiptest { "0" | "1" }?
|
||||
record = element record { attlist.record, field* }
|
||||
attlist.record &= attribute model { text }
|
||||
attlist.record &= attribute id { text }
|
||||
|
||||
@@ -55,17 +55,6 @@
|
||||
</attribute>
|
||||
</optional>
|
||||
</define>
|
||||
<define name="attlist.data" combine="interleave">
|
||||
<optional>
|
||||
<attribute>
|
||||
<name ns="">skiptest</name>
|
||||
<choice>
|
||||
<value>0</value>
|
||||
<value>1</value>
|
||||
</choice>
|
||||
</attribute>
|
||||
</optional>
|
||||
</define>
|
||||
<define name="record">
|
||||
<element>
|
||||
<name ns="">record</name>
|
||||
|
||||
Reference in new issue
Block a user