[meego-commits] 11116: Changes to Tools:Testing/mtdv

[Sampo Saaristo]

Hi,
I have made the following changes to mtdv in project Tools:Testing. Please review and accept ASAP.

Thank You,
Sampo Saaristo

[This message was auto-generated]

---

Request #11116:

  submit:   devel:quality/mtdv(r6) -> Tools:Testing/mtdv


Message:
    version 0.0.6- Added test case status check


State:   new          2010-12-21T04:27:08 samposa
Comment: None



changes files:
--------------
--- mtdv.changes
+++ mtdv.changes
@@ -1,2 +1,5 @@
-* Wed Dec 15 2010 Esa-Pekka Miettinen <esa-pekka.miettinen at digia.com> 0.0.5
-  - Fixed schema validation return value
+* Fri Dec 17 2010 Esa-Pekka Miettinen <esa-pekka.miettinen at digia.com> 0.0.6
+ - Added test case status check
+
+* Thu Dec 16 2010 Esa-Pekka Miettinen <esa-pekka.miettinen at digia.com> 0.0.5
+ - Fixed schema validation return value

old:
----
  mtdv_0.0.5.dsc
  mtdv_0.0.5.tar.gz

new:
----
  mtdv_0.0.6.dsc
  mtdv_0.0.6.tar.gz

spec files:
-----------
--- mtdv.spec
+++ mtdv.spec
@@ -1,8 +1,8 @@
 Summary: Tool for validating tests.xml and MIN script cases
 Name: mtdv
-Version: 0.0.5
+Version: 0.0.6
 Release: 1
-Source0: mtdv_0.0.5.tar.gz
+Source0: mtdv_0.0.6.tar.gz
 License: LGPL
 Group: Development/Libraries
 BuildRequires: python-setuptools, python-lxml

dsc files:
----------

++++++ new dsc file:
--- mtdv_0.0.6.dsc
+++ mtdv_0.0.6.dsc
+Format: 1.0
+Source: mtdv
+Binary: python-mtdv
+Architecture: all
+Version: 0.0.6
+Maintainer: Esa-Pekka Miettinen <esa-pekka.miettinen at digia.com>
+Standards-Version: 3.8.4
+Build-Depends: python-setuptools (>= 0.6b3), debhelper (>= 7), python-support (>= 0.8.4), python-lxml
+Checksums-Sha1: 
+ 1c4ecf74aa59d10bfee37894ea327dd7e32c48c0 8931 mtdv_0.0.6.tar.gz
+Checksums-Sha256: 
+ d40422a2691464c1cac251694f3e41a9fbe2c92d143b9ebbc66d61a100cbea54 8931 mtdv_0.0.6.tar.gz
+Files: 
+ e6da860fa8189a96089ff8a91b958aad 8931 mtdv_0.0.6.tar.gz
+Python-Version: current

++++++ deleted dsc files:
--- mtdv_0.0.5.dsc

other changes:
--------------

++++++ mtdv_0.0.5.tar.gz -> mtdv_0.0.6.tar.gz
--- debian/changelog
+++ debian/changelog
@@ -1,3 +1,8 @@
+mtdv (0.0.6) unstable; urgency=low
+  * Added test case status check
+  
+ -- Esa-Pekka Miettinen <esa-pekka.miettinen at digia.com>  Fri, 17 Dec 2010 12:27:15 +0200
+ 
 mtdv (0.0.5) unstable; urgency=low
   * Fixed schema validation return value
   
--- mtdv.changes
+++ mtdv.changes
@@ -1,5 +1,8 @@
-* Wed Dec 15 2010 Esa-Pekka Miettinen <esa-pekka.miettinen at digia.com> 0.0.5
-  - Fixed schema validation return value
+* Fri Dec 17 2010 Esa-Pekka Miettinen <esa-pekka.miettinen at digia.com> 0.0.6
+ - Added test case status check
+
+* Thu Dec 16 2010 Esa-Pekka Miettinen <esa-pekka.miettinen at digia.com> 0.0.5
+ - Fixed schema validation return value
 
 * Wed Dec 15 2010 Esa-Pekka Miettinen <esa-pekka.miettinen at digia.com> 0.0.4
  - Fixed returning values
--- mtdv.egg-info/PKG-INFO
+++ mtdv.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: mtdv
-Version: 0.0.5dev
+Version: 0.0.6dev
 Summary: UNKNOWN
 Home-page: http://meego.gitorious.org/meego-quality-assurance/scripts-and-utils
 Author: Esa-Pekka Miettinen
--- mtdv.spec
+++ mtdv.spec
@@ -1,8 +1,8 @@
 Summary: Tool for validating tests.xml and MIN script cases
 Name: mtdv
-Version: 0.0.5
+Version: 0.0.6
 Release: 1
-Source0: mtdv_0.0.5.tar.gz
+Source0: mtdv_0.0.6.tar.gz
 License: LGPL
 Group: Development/Libraries
 BuildRequires: python-setuptools, python-lxml
--- mtdv/mtdv.py
+++ mtdv/mtdv.py
@@ -144,10 +144,25 @@
             for element in xmlroot.iter():
                 if element.tag == "case":
                     testcase = element.attrib.get("name")
-                    if testcase != None:
-                        LOG.debug("xml: new test case: '%s'" % testcase)
-                        testcases.append(testcase)
-                        count += 1
+                    testcasestate = element.attrib.get("state")
+                    
+                    if testcase is None:
+                        continue
+                    
+                    # One way of checking test case status
+                    if not testcasestate is None:
+                        if testcasestate == "Design":
+                            LOG.debug("xml: design test case: '%s'" % testcase)
+                            continue
+                    
+                    # Another way of checking test case status
+                    if element.find("step") is None:
+                        LOG.debug("xml: design test case: '%s'" % testcase)
+                        continue
+                    
+                    LOG.debug("xml: new test case: '%s'" % testcase)
+                    testcases.append(testcase)
+                    count += 1
             
             LOG.info("Got %d test case(s) from the %s" % (count, testfile))
         
--- mtdv/tests/testdata/valid_tests.xml
+++ mtdv/tests/testdata/valid_tests.xml
@@ -32,4 +32,13 @@
   </set>
   
  </suite>
+ 
+ <suite domain="System" name="mtdv-tests-planned">
+  
+  <set description="unittest" feature="unittest" name="unittest_planned">
+   <case timeout="600" type="Functional" name="FUTE-Test-Test_6" />
+   <case timeout="600" type="Functional" name="FUTE-Test-Test_7" state="Design" /> 
+  </set>
+  
+ </suite>
 </testdefinition>
--- setup.py
+++ setup.py
@@ -27,7 +27,7 @@
     author='Esa-Pekka Miettinen',
     author_email='esa-pekka.miettinen at digia.com',
     url='http://meego.gitorious.org/meego-quality-assurance/scripts-and-utils',
-    version =  "0.0.5",
+    version =  "0.0.6",
     include_package_data = True,
     namespace_packages = ['mtdv'],
     install_requires = ['lxml'],