[Lsb-messages] /var/www/bzr/lsb/devel/python-test r54: Rework the generated test_pythonModPresent.py to something more harness

Stew Benedict stewb at linux-foundation.org
Tue Mar 13 18:18:21 UTC 2012


------------------------------------------------------------
revno: 54
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: python-test
timestamp: Tue 2012-03-13 14:18:21 -0400
message:
  Rework the generated test_pythonModPresent.py to something more harness
  friendly and enable it (renamed it as the harness looks for test_foo) - bug 3458
renamed:
  scripts/package/gen_tst_pythonModPresent.py => scripts/package/gen_test_pythonModPresent.py
  scripts/package/tst_pythonModPresent.py => scripts/package/test_pythonModPresent.py
modified:
  scripts/package/Makefile
  scripts/package/lsb-test-python.spec.sed
  scripts/package/python-tet-test.patch
  scripts/package/gen_test_pythonModPresent.py
  scripts/package/test_pythonModPresent.py
-------------- next part --------------
=== modified file 'scripts/package/Makefile'
--- a/scripts/package/Makefile	2012-03-13 15:03:42 +0000
+++ b/scripts/package/Makefile	2012-03-13 18:18:21 +0000
@@ -1,7 +1,7 @@
 # XXX We should play the usual tricks defining stuff here and building
 # XXX a specfile from this info, but not yet: for now keep in sync
 PACKAGE=lsb-test-python
-VERSION=4.1.3
+VERSION=4.1.4
 RELEASE=1
 PVER4=2.4.2
 PVER5=2.5
@@ -81,7 +81,7 @@
 
 gensrc:
 	mysql $(DBOPTS) $$LSBDB < get_python_modules.sql > $(MODULE_LIST)
-	./gen_tst_pythonModPresent.py $(LSB_VERSION) > tst_pythonModPresent.py
+	./gen_test_pythonModPresent.py $(LSB_VERSION) > test_pythonModPresent.py
 
 tarball: $(SOURCE0) $(SOURCE1) $(SOURCE2) $(TETJ)
 

=== renamed file 'scripts/package/gen_tst_pythonModPresent.py' => 'scripts/package/gen_test_pythonModPresent.py'
--- a/scripts/package/gen_tst_pythonModPresent.py	2012-03-13 15:03:42 +0000
+++ b/scripts/package/gen_test_pythonModPresent.py	2012-03-13 18:18:21 +0000
@@ -1,11 +1,11 @@
 #!/usr/bin/python
 """
-gen_tst_pythonModPresent.py - generate checkers to test
+gen_test_pythonModPresent.py - generate checkers to test
 presence of python modules
 
 Usage:
 
-gen_tst_pythonModPresent.py [lsbversion] > tst_pythonModPresent.py
+gen_test_pythonModPresent.py [lsbversion] > test_pythonModPresent.py
 """
 
 # Author: Denis Silakov
@@ -21,12 +21,11 @@
 DEFAULTVER = "4.1"
 
 def print_test(mod, tst_cnt):
-    print """try:
-    import """ + mod + """
-    print "ok """ + str(tst_cnt) + """ - import """ + mod + """"
-    passed += 1
-except:
-    print "not ok """ + str(tst_cnt) + """ - import """ + mod + """"
+    print """    def test_""" + mod + """(self):
+        try:
+             import """ + mod + """
+        except ImportError:
+             self.fail("failed to import """ + mod + """")
 """
 
 def main():
@@ -57,7 +56,13 @@
 
     print """#!/usr/bin/python
 
-passed = 0
+import unittest
+from test.test_support import verbose, run_unittest
+
+
+from test.test_support import *
+
+class ModPresent(unittest.TestCase):
 """
 
     tst_cnt = 1
@@ -69,10 +74,12 @@
 
     itemlist.close()
 
-    print "print \"Passed \" + str(passed) + \" tests of " + str(tst_cnt-1) + "\""
-
-    print "sys.exit(passed != " + str(tst_cnt-1) + ")"
-
+    print """def test_main():
+    run_unittest(ModPresent)
+
+if __name__ == "__main__":
+    test_main()
+"""
 
 if __name__ == '__main__':
     main()

=== modified file 'scripts/package/lsb-test-python.spec.sed'
--- a/scripts/package/lsb-test-python.spec.sed	2012-03-13 15:03:42 +0000
+++ b/scripts/package/lsb-test-python.spec.sed	2012-03-13 18:18:21 +0000
@@ -17,7 +17,7 @@
 Source2: http://www.python.org/ftp/python/%{pversion5}/Python-%{pversion5}.tar.bz2
 Source3: tetj.py
 Source4: lsb-python-modules.list
-Source5: tst_pythonModPresent.py
+Source5: test_pythonModPresent.py
 Patch0: python-system-python.patch
 Patch1: python-tet-test.patch
 Patch2: python-test-new-behavior.patch
@@ -262,6 +262,12 @@
 # add the new module test
 install -d ${RPM_BUILD_ROOT}/opt/lsb/test/python/all
 install %{SOURCE5} ${RPM_BUILD_ROOT}/opt/lsb/test/python/all
+cd ${RPM_BUILD_ROOT}/opt/lsb/test/python
+for ext in 24 25;do
+  cd Lib$ext/test
+  ln -s ../../all/*.py .
+  cd -
+done
 
 #==================================================
 %clean

=== modified file 'scripts/package/python-tet-test.patch'
--- a/scripts/package/python-tet-test.patch	2011-02-03 22:09:09 +0000
+++ b/scripts/package/python-tet-test.patch	2012-03-13 18:18:21 +0000
@@ -42,7 +42,7 @@
 +    journal.add_config("PYTHON_VERSION=%s" % pyversion)
 +    journal.config_end()
 +    # this is hardcoded, will need refreshing if tests change
-+    journal.scenario_info("total tests in python-test 106"); 
++    journal.scenario_info("total tests in python-test 107"); 
 +    journal.testcase_start(testapp)
      for test in tests:
 +        tcount = tcount + 1
@@ -143,7 +143,7 @@
 +    journal.add_config("PYTHON_VERSION=%s" % pyversion)
 +    journal.config_end()
 +    # this is hardcoded, will need refreshing if tests change
-+    journal.scenario_info("total tests in python-test 106"); 
++    journal.scenario_info("total tests in python-test 107"); 
 +    journal.testcase_start(testapp)
      for test in tests:
 +        tcount = tcount + 1

=== renamed file 'scripts/package/tst_pythonModPresent.py' => 'scripts/package/test_pythonModPresent.py'
--- a/scripts/package/tst_pythonModPresent.py	2012-03-13 15:03:42 +0000
+++ b/scripts/package/test_pythonModPresent.py	2012-03-13 18:18:21 +0000
@@ -1,321 +1,286 @@
 #!/usr/bin/python
 
-passed = 0
-
-try:
-    import array
-    print "ok 1 - import array"
-    passed += 1
-except:
-    print "not ok 1 - import array"
-
-try:
-    import binascii
-    print "ok 2 - import binascii"
-    passed += 1
-except:
-    print "not ok 2 - import binascii"
-
-try:
-    import bisect
-    print "ok 3 - import bisect"
-    passed += 1
-except:
-    print "not ok 3 - import bisect"
-
-try:
-    import cPickle
-    print "ok 4 - import cPickle"
-    passed += 1
-except:
-    print "not ok 4 - import cPickle"
-
-try:
-    import cStringIO
-    print "ok 5 - import cStringIO"
-    passed += 1
-except:
-    print "not ok 5 - import cStringIO"
-
-try:
-    import cmath
-    print "ok 6 - import cmath"
-    passed += 1
-except:
-    print "not ok 6 - import cmath"
-
-try:
-    import codecs
-    print "ok 7 - import codecs"
-    passed += 1
-except:
-    print "not ok 7 - import codecs"
-
-try:
-    import collections
-    print "ok 8 - import collections"
-    passed += 1
-except:
-    print "not ok 8 - import collections"
-
-try:
-    import crypt
-    print "ok 9 - import crypt"
-    passed += 1
-except:
-    print "not ok 9 - import crypt"
-
-try:
-    import csv
-    print "ok 10 - import csv"
-    passed += 1
-except:
-    print "not ok 10 - import csv"
-
-try:
-    import datetime
-    print "ok 11 - import datetime"
-    passed += 1
-except:
-    print "not ok 11 - import datetime"
-
-try:
-    import errno
-    print "ok 12 - import errno"
-    passed += 1
-except:
-    print "not ok 12 - import errno"
-
-try:
-    import exceptions
-    print "ok 13 - import exceptions"
-    passed += 1
-except:
-    print "not ok 13 - import exceptions"
-
-try:
-    import fcntl
-    print "ok 14 - import fcntl"
-    passed += 1
-except:
-    print "not ok 14 - import fcntl"
-
-try:
-    import gc
-    print "ok 15 - import gc"
-    passed += 1
-except:
-    print "not ok 15 - import gc"
-
-try:
-    import grp
-    print "ok 16 - import grp"
-    passed += 1
-except:
-    print "not ok 16 - import grp"
-
-try:
-    import heapq
-    print "ok 17 - import heapq"
-    passed += 1
-except:
-    print "not ok 17 - import heapq"
-
-try:
-    import hotshot
-    print "ok 18 - import hotshot"
-    passed += 1
-except:
-    print "not ok 18 - import hotshot"
-
-try:
-    import imp
-    print "ok 19 - import imp"
-    passed += 1
-except:
-    print "not ok 19 - import imp"
-
-try:
-    import itertools
-    print "ok 20 - import itertools"
-    passed += 1
-except:
-    print "not ok 20 - import itertools"
-
-try:
-    import locale
-    print "ok 21 - import locale"
-    passed += 1
-except:
-    print "not ok 21 - import locale"
-
-try:
-    import marshal
-    print "ok 22 - import marshal"
-    passed += 1
-except:
-    print "not ok 22 - import marshal"
-
-try:
-    import mmap
-    print "ok 23 - import mmap"
-    passed += 1
-except:
-    print "not ok 23 - import mmap"
-
-try:
-    import operator
-    print "ok 24 - import operator"
-    passed += 1
-except:
-    print "not ok 24 - import operator"
-
-try:
-    import os
-    print "ok 25 - import os"
-    passed += 1
-except:
-    print "not ok 25 - import os"
-
-try:
-    import ossaudiodev
-    print "ok 26 - import ossaudiodev"
-    passed += 1
-except:
-    print "not ok 26 - import ossaudiodev"
-
-try:
-    import parser
-    print "ok 27 - import parser"
-    passed += 1
-except:
-    print "not ok 27 - import parser"
-
-try:
-    import posix
-    print "ok 28 - import posix"
-    passed += 1
-except:
-    print "not ok 28 - import posix"
-
-try:
-    import pwd
-    print "ok 29 - import pwd"
-    passed += 1
-except:
-    print "not ok 29 - import pwd"
-
-try:
-    import random
-    print "ok 30 - import random"
-    passed += 1
-except:
-    print "not ok 30 - import random"
-
-try:
-    import re
-    print "ok 31 - import re"
-    passed += 1
-except:
-    print "not ok 31 - import re"
-
-try:
-    import resource
-    print "ok 32 - import resource"
-    passed += 1
-except:
-    print "not ok 32 - import resource"
-
-try:
-    import select
-    print "ok 33 - import select"
-    passed += 1
-except:
-    print "not ok 33 - import select"
-
-try:
-    import signal
-    print "ok 34 - import signal"
-    passed += 1
-except:
-    print "not ok 34 - import signal"
-
-try:
-    import socket
-    print "ok 35 - import socket"
-    passed += 1
-except:
-    print "not ok 35 - import socket"
-
-try:
-    import string
-    print "ok 36 - import string"
-    passed += 1
-except:
-    print "not ok 36 - import string"
-
-try:
-    import sys
-    print "ok 37 - import sys"
-    passed += 1
-except:
-    print "not ok 37 - import sys"
-
-try:
-    import syslog
-    print "ok 38 - import syslog"
-    passed += 1
-except:
-    print "not ok 38 - import syslog"
-
-try:
-    import termios
-    print "ok 39 - import termios"
-    passed += 1
-except:
-    print "not ok 39 - import termios"
-
-try:
-    import thread
-    print "ok 40 - import thread"
-    passed += 1
-except:
-    print "not ok 40 - import thread"
-
-try:
-    import time
-    print "ok 41 - import time"
-    passed += 1
-except:
-    print "not ok 41 - import time"
-
-try:
-    import unicodedata
-    print "ok 42 - import unicodedata"
-    passed += 1
-except:
-    print "not ok 42 - import unicodedata"
-
-try:
-    import weakref
-    print "ok 43 - import weakref"
-    passed += 1
-except:
-    print "not ok 43 - import weakref"
-
-try:
-    import zipimport
-    print "ok 44 - import zipimport"
-    passed += 1
-except:
-    print "not ok 44 - import zipimport"
-
-try:
-    import zlib
-    print "ok 45 - import zlib"
-    passed += 1
-except:
-    print "not ok 45 - import zlib"
-
-print "Passed " + str(passed) + " tests of 45"
-sys.exit(passed != 45)
+import unittest
+from test.test_support import verbose, run_unittest
+
+
+from test.test_support import *
+
+class ModPresent(unittest.TestCase):
+
+    def test_array(self):
+        try:
+             import array
+        except ImportError:
+             self.fail("failed to import array")
+
+    def test_binascii(self):
+        try:
+             import binascii
+        except ImportError:
+             self.fail("failed to import binascii")
+
+    def test_bisect(self):
+        try:
+             import bisect
+        except ImportError:
+             self.fail("failed to import bisect")
+
+    def test_cPickle(self):
+        try:
+             import cPickle
+        except ImportError:
+             self.fail("failed to import cPickle")
+
+    def test_cStringIO(self):
+        try:
+             import cStringIO
+        except ImportError:
+             self.fail("failed to import cStringIO")
+
+    def test_cmath(self):
+        try:
+             import cmath
+        except ImportError:
+             self.fail("failed to import cmath")
+
+    def test_codecs(self):
+        try:
+             import codecs
+        except ImportError:
+             self.fail("failed to import codecs")
+
+    def test_collections(self):
+        try:
+             import collections
+        except ImportError:
+             self.fail("failed to import collections")
+
+    def test_crypt(self):
+        try:
+             import crypt
+        except ImportError:
+             self.fail("failed to import crypt")
+
+    def test_csv(self):
+        try:
+             import csv
+        except ImportError:
+             self.fail("failed to import csv")
+
+    def test_datetime(self):
+        try:
+             import datetime
+        except ImportError:
+             self.fail("failed to import datetime")
+
+    def test_errno(self):
+        try:
+             import errno
+        except ImportError:
+             self.fail("failed to import errno")
+
+    def test_exceptions(self):
+        try:
+             import exceptions
+        except ImportError:
+             self.fail("failed to import exceptions")
+
+    def test_fcntl(self):
+        try:
+             import fcntl
+        except ImportError:
+             self.fail("failed to import fcntl")
+
+    def test_gc(self):
+        try:
+             import gc
+        except ImportError:
+             self.fail("failed to import gc")
+
+    def test_grp(self):
+        try:
+             import grp
+        except ImportError:
+             self.fail("failed to import grp")
+
+    def test_heapq(self):
+        try:
+             import heapq
+        except ImportError:
+             self.fail("failed to import heapq")
+
+    def test_hotshot(self):
+        try:
+             import hotshot
+        except ImportError:
+             self.fail("failed to import hotshot")
+
+    def test_imp(self):
+        try:
+             import imp
+        except ImportError:
+             self.fail("failed to import imp")
+
+    def test_itertools(self):
+        try:
+             import itertools
+        except ImportError:
+             self.fail("failed to import itertools")
+
+    def test_locale(self):
+        try:
+             import locale
+        except ImportError:
+             self.fail("failed to import locale")
+
+    def test_marshal(self):
+        try:
+             import marshal
+        except ImportError:
+             self.fail("failed to import marshal")
+
+    def test_mmap(self):
+        try:
+             import mmap
+        except ImportError:
+             self.fail("failed to import mmap")
+
+    def test_operator(self):
+        try:
+             import operator
+        except ImportError:
+             self.fail("failed to import operator")
+
+    def test_os(self):
+        try:
+             import os
+        except ImportError:
+             self.fail("failed to import os")
+
+    def test_ossaudiodev(self):
+        try:
+             import ossaudiodev
+        except ImportError:
+             self.fail("failed to import ossaudiodev")
+
+    def test_parser(self):
+        try:
+             import parser
+        except ImportError:
+             self.fail("failed to import parser")
+
+    def test_posix(self):
+        try:
+             import posix
+        except ImportError:
+             self.fail("failed to import posix")
+
+    def test_pwd(self):
+        try:
+             import pwd
+        except ImportError:
+             self.fail("failed to import pwd")
+
+    def test_random(self):
+        try:
+             import random
+        except ImportError:
+             self.fail("failed to import random")
+
+    def test_re(self):
+        try:
+             import re
+        except ImportError:
+             self.fail("failed to import re")
+
+    def test_resource(self):
+        try:
+             import resource
+        except ImportError:
+             self.fail("failed to import resource")
+
+    def test_select(self):
+        try:
+             import select
+        except ImportError:
+             self.fail("failed to import select")
+
+    def test_signal(self):
+        try:
+             import signal
+        except ImportError:
+             self.fail("failed to import signal")
+
+    def test_socket(self):
+        try:
+             import socket
+        except ImportError:
+             self.fail("failed to import socket")
+
+    def test_string(self):
+        try:
+             import string
+        except ImportError:
+             self.fail("failed to import string")
+
+    def test_sys(self):
+        try:
+             import sys
+        except ImportError:
+             self.fail("failed to import sys")
+
+    def test_syslog(self):
+        try:
+             import syslog
+        except ImportError:
+             self.fail("failed to import syslog")
+
+    def test_termios(self):
+        try:
+             import termios
+        except ImportError:
+             self.fail("failed to import termios")
+
+    def test_thread(self):
+        try:
+             import thread
+        except ImportError:
+             self.fail("failed to import thread")
+
+    def test_time(self):
+        try:
+             import time
+        except ImportError:
+             self.fail("failed to import time")
+
+    def test_unicodedata(self):
+        try:
+             import unicodedata
+        except ImportError:
+             self.fail("failed to import unicodedata")
+
+    def test_weakref(self):
+        try:
+             import weakref
+        except ImportError:
+             self.fail("failed to import weakref")
+
+    def test_zipimport(self):
+        try:
+             import zipimport
+        except ImportError:
+             self.fail("failed to import zipimport")
+
+    def test_zlib(self):
+        try:
+             import zlib
+        except ImportError:
+             self.fail("failed to import zlib")
+
+def test_main():
+    run_unittest(ModPresent)
+
+if __name__ == "__main__":
+    test_main()
+



More information about the lsb-messages mailing list