From bc0c6f13f908d4bfb89f6a359f1012be435a0ab2 Mon Sep 17 00:00:00 2001
From: Sergi Almacellas Abellana <sergi@koolpi.com>
Date: Fri, 15 Nov 2019 20:43:33 +0100
Subject: [PATCH] Drop support for skiptest attribute on xml files

issue8735
review270351002
---
 CHANGELOG                    |  1 +
 doc/topics/modules/index.rst |  1 -
 trytond/convert.py           |  6 +-----
 trytond/tryton.rnc           |  1 -
 trytond/tryton.rng           | 11 -----------
 5 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 096f22d627..c51baa9e29 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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
diff --git a/doc/topics/modules/index.rst b/doc/topics/modules/index.rst
index 1ac2aa4f4b..441cbd2dae 100644
--- a/doc/topics/modules/index.rst
+++ b/doc/topics/modules/index.rst
@@ -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.
diff --git a/trytond/convert.py b/trytond/convert.py
index c1dde99f19..067acb42c8 100644
--- a/trytond/convert.py
+++ b/trytond/convert.py
@@ -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):
diff --git a/trytond/tryton.rnc b/trytond/tryton.rnc
index f7def341b9..c8d0e2766b 100644
--- a/trytond/tryton.rnc
+++ b/trytond/tryton.rnc
@@ -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 }
diff --git a/trytond/tryton.rng b/trytond/tryton.rng
index 8dafde0535..8ee0abd185 100644
--- a/trytond/tryton.rng
+++ b/trytond/tryton.rng
@@ -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>