[asterisk-commits] pabelanger: branch pabelanger/digiumphones r3076 - in /asterisk/team/pabelang...

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Fri Mar  2 11:38:58 2012
New Revision: 3076

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=3076
Log:
Remove minversion and maxversion

Modified:
    asterisk/team/pabelanger/digiumphones/lib/python/asterisk/TestConfig.py
    asterisk/team/pabelanger/digiumphones/runtests.py

Modified: asterisk/team/pabelanger/digiumphones/lib/python/asterisk/TestConfig.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/digiumphones/lib/python/asterisk/TestConfig.py?view=diff&rev=3076&r1=3075&r2=3076
==============================================================================
--- asterisk/team/pabelanger/digiumphones/lib/python/asterisk/TestConfig.py (original)
+++ asterisk/team/pabelanger/digiumphones/lib/python/asterisk/TestConfig.py Fri Mar  2 11:38:58 2012
@@ -241,10 +241,6 @@
         self.skip = None
         self.config = None
         self.summary = None
-        self.maxversion = None
-        self.maxversion_check = False
-        self.minversion = None
-        self.minversion_check = False
         self.deps = []
         self.tags = []
         self.expectPass = True
@@ -294,26 +290,11 @@
             self.description = testinfo["description"]
 
     def __process_properties(self):
-        self.minversion = AsteriskVersion("1.4")
         if self.config == None:
             return
         if "properties" not in self.config:
             return
         properties = self.config["properties"]
-        if "minversion" in properties:
-            try:
-                self.minversion = AsteriskVersion(properties["minversion"])
-            except:
-                self.can_run = False
-                print "ERROR: '%s' is not a valid minversion" % \
-                        properties["minversion"]
-        if "maxversion" in properties:
-            try:
-                self.maxversion = AsteriskVersion(properties["maxversion"])
-            except:
-                self.can_run = False
-                print "ERROR: '%s' is not a valid maxversion" % \
-                        properties["maxversion"]
         if "expectedResult" in properties:
             try:
                 self.expectPass = not (properties["expectedResult"].upper().strip() == "FAIL")
@@ -392,18 +373,6 @@
             Dependency(d)
                 for d in self.config["properties"].get("dependencies") or []
         ]
-
-        self.minversion_check = True
-        if ast_version < self.minversion:
-            self.can_run = False
-            self.minversion_check = False
-            return self.can_run
-
-        self.maxversion_check = True
-        if self.maxversion is not None and ast_version > self.maxversion:
-            self.can_run = False
-            self.maxversion_check = False
-            return self.can_run
 
         for d in self.deps:
             if d.met is False:

Modified: asterisk/team/pabelanger/digiumphones/runtests.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/digiumphones/runtests.py?view=diff&rev=3076&r1=3075&r2=3076
==============================================================================
--- asterisk/team/pabelanger/digiumphones/runtests.py (original)
+++ asterisk/team/pabelanger/digiumphones/runtests.py Fri Mar  2 11:38:58 2012
@@ -195,11 +195,6 @@
         for t in self.tests:
             print "%.3d) %s" % (i, t.test_config.test_name)
             print "      --> Summary: %s" % t.test_config.summary
-            print "      --> Minimum Version: %s (%s)" % \
-                         (str(t.test_config.minversion), str(t.test_config.minversion_check))
-            if t.test_config.maxversion is not None:
-                print "      --> Maximum Version: %s (%s)" % \
-                             (str(t.test_config.maxversion), str(t.test_config.maxversion_check))
             for d in t.test_config.deps:
                 if d.version:
                     print "      --> Dependency: %s" % (d.name)
@@ -220,11 +215,6 @@
                     continue
 
                 print "--> Cannot run test '%s'" % t.test_name
-                print "--- --> Minimum Version: %s (%s)" % \
-                    (str(t.test_config.minversion), str(t.test_config.minversion_check))
-                if t.test_config.maxversion is not None:
-                    print "--- --> Maximum Version: %s (%s)" % \
-                        (str(t.test_config.maxversion), str(t.test_config.maxversion_check))
                 print "--- --> Tags: %s" % (t.test_config.tags)
                 for d in t.test_config.deps:
                     print "--- --> Dependency: %s - %s" % (d.name, str(d.met))