[meego-commits] 10850: Changes to Trunk/test-definition
Rolla Selbak
no_reply at build.meego.com
Fri Dec 10 22:29:22 UTC 2010
Hi,
I have made the following changes to test-definition in project Trunk. Please review and accept ASAP.
Thank You,
Rolla Selbak
[This message was auto-generated]
---
Request #10850:
submit: Trunk:Testing/test-definition(r5) -> Trunk/test-definition
Message:
Trunk promotion
State: new 2010-12-10T14:29:21 rolla
Comment: None
changes files:
--------------
--- test-definition.changes
+++ test-definition.changes
@@ -0,0 +1,4 @@
+* Fri Dec 10 2010 Sampo Saaristo <sampo.saaristo at sofica.fi> 1.2.1
+- Result schema updated to accept the same attributes as test definition (BMC#10862)
+* Wed Dec 8 2010 Timo Härkönen <timo.harkonen at digia.com> 1.2.0
+- Removed eat dependency from tests package
old:
----
test-definition-1.2.0.tar.gz
new:
----
test-definition-1.2.1.tar.gz
spec files:
-----------
--- test-definition.spec
+++ test-definition.spec
@@ -1,5 +1,5 @@
Name: test-definition
-Version: 1.2.0
+Version: 1.2.1
Release: 1
Summary: Provides schemas for validating test definition XML
@@ -15,7 +15,7 @@
%package tests
Summary: Acceptance tests for schemas in package test-definition
-Requires: test-definition, eat
+Requires: test-definition
%description
Provides two validation schemas; testdefinition-syntax.xsd for validating XML schematics and
dsc files:
----------
--- test-definition.dsc
+++ test-definition.dsc
@@ -2,7 +2,7 @@
Source: test-definition
Binary: test-definition, test-definition-tests
Architecture: all
-Version: 1.2.0
-Maintainer: Riku Halonen <riku.halonen at nokia.com>
+Version: 1.2.1
+Maintainer: Timo Härkönen <timo.harkonen at digia.com>
Standards-Version: 3.7.2
Build-Depends: debhelper (>= 5)
other changes:
--------------
++++++ debian.changelog
--- debian.changelog
+++ debian.changelog
@@ -1,3 +1,9 @@
+test-definition (1.2.1) unstable; urgency=low
+
+ * Result schema updated to accept the same attributes as test definition (BMC#10862)
+
+ -- Sampo Saaristo <sampo.saaristo at sofica.fi> Fri, 10 Dec 2010 11:25:47 +0200
+
test-definition (1.2.0) unstable; urgency=low
* Added bugzilla_id attribute to test case (BMC#10359)
++++++ test-definition-1.2.0.tar.gz -> test-definition-1.2.1.tar.gz
--- debian/changelog
+++ debian/changelog
@@ -1,3 +1,9 @@
+test-definition (1.2.1) unstable; urgency=low
+
+ * Result schema updated to accept the same attributes as test definition (BMC#10862)
+
+ -- Sampo Saaristo <sampo.saaristo at sofica.fi> Fri, 10 Dec 2010 11:25:47 +0200
+
test-definition (1.2.0) unstable; urgency=low
* Added bugzilla_id attribute to test case (BMC#10359)
--- src/data/testdefinition-results.xsd
+++ src/data/testdefinition-results.xsd
@@ -37,21 +37,28 @@
<xs:attribute name="requirement"/>
- <xs:attribute name="timeout" default="90" type="xs:positiveInteger"/>
+ <xs:attribute name="timeout" type="xs:positiveInteger"/>
<xs:attribute name="type" default="unknown"/>
<xs:attribute name="level" default="unknown"/>
- <xs:attribute name="manual" default="false" type="xs:boolean" />
+ <xs:attribute name="manual" type="xs:boolean" />
+
+ <xs:attribute name="insignificant" type="xs:boolean" />
+
+ <xs:attribute name="hwid"/>
- <xs:attribute name="insignificant" default="false" type="xs:boolean" />
</xs:attributeGroup>
<xs:element name="testresults">
<xs:complexType>
- <xs:sequence>
- <xs:element ref="suite" minOccurs="1" maxOccurs="unbounded" />
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:choice>
+ <xs:element ref="suite" minOccurs="1" maxOccurs="unbounded" />
+ <xs:element ref="hwiddetect" minOccurs="0" maxOccurs="1" />
+ <xs:element name="description" minOccurs="0" maxOccurs="1" />
+ </xs:choice>
</xs:sequence>
<xs:attribute name="version" use="required" />
<xs:attribute name="environment" use="required" />
@@ -68,7 +75,10 @@
<xs:element name="suite">
<xs:complexType>
<xs:sequence>
- <xs:element ref="set" minOccurs="0" maxOccurs="unbounded" />
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="set" minOccurs="0" maxOccurs="unbounded" />
+ <xs:element name="description" minOccurs="0" maxOccurs="1" />
+ </xs:choice>
</xs:sequence>
<xs:attributeGroup ref="general_attributes"/>
<xs:attribute name="domain" />
@@ -82,10 +92,31 @@
<xs:element name="set">
<xs:complexType>
- <xs:sequence>
- <xs:element ref="case" minOccurs="0" maxOccurs="unbounded" />
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:choice>
+ <xs:element name="pre_steps" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="step" maxOccurs="unbounded" />
+ </xs:sequence>
+ <xs:attribute name="timeout" type="xs:positiveInteger"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="post_steps" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="step" maxOccurs="unbounded" />
+ </xs:sequence>
+ <xs:attribute name="timeout" type="xs:positiveInteger"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:sequence>
+ <xs:element ref="case" minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ <xs:element name="description" minOccurs="0" maxOccurs="1" />
+ <xs:element ref="get" minOccurs="0" maxOccurs="1"/>
+ </xs:choice>
</xs:sequence>
-
<xs:attributeGroup ref="general_attributes"/>
<xs:attribute name="feature"/>
<xs:attribute name="environment" />
@@ -130,7 +161,7 @@
<xs:element name="stdout" minOccurs="0" maxOccurs="1" />
<xs:element name="stderr" minOccurs="0" maxOccurs="1" />
</xs:sequence>
-
+ <xs:attribute name="manual" type="xs:boolean" />
<xs:attribute name="command" use="required" />
<xs:attribute name="result" use="required">
<xs:simpleType>
@@ -145,4 +176,29 @@
</xs:complexType>
</xs:element>
+<xs:element name="hwiddetect">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string" />
+ </xs:simpleContent>
+ </xs:complexType>
+</xs:element>
+
+<xs:element name="get">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="file" minOccurs="1" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="delete_after" type="xs:boolean"
+ use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+</xs:element>
+
</xs:schema>
--- test-definition.changes
+++ test-definition.changes
@@ -1,3 +1,5 @@
+* Fri Dec 10 2010 Sampo Saaristo <sampo.saaristo at sofica.fi> 1.2.1
+- Result schema updated to accept the same attributes as test definition (BMC#10862)
* Thu Nov 25 2010 Sampo Saaristo <sampo.saaristo at sofica.fi> 1.2.0
- Added bugzilla_id attribute for case (BMC#10359)
* Mon Nov 22 2010 Sampo Saaristo <sampo.saaristo at sofica.fi> 1.1.9
--- test-definition.spec
+++ test-definition.spec
@@ -1,5 +1,5 @@
Name: test-definition
-Version: 1.2.0
+Version: 1.2.1
Release: 1
Summary: Provides schemas for validating test definition XML
More information about the MeeGo-commits
mailing list