Merge lp:~psivaa/auto-upgrade-testing/bug1159671 into lp:~auto-upgrade-testing-dev/auto-upgrade-testing/trunk

[Para Siva]

The change is to try and import all the possible modules from sys.path as specified in bug 1159671.
The main change is on rev 75. The next one is re: pep8 changes.

[Paul Larson (pwlars)]

82 - self.distpackages = '/usr/lib/%s/dist-packages/' % self.default_version
83 - self.stderr = open('/tmp/%s.stderr' % os.path.basename(__file__)[:-3],'w')
84 + self.distpackages = []
85 + for dist_path in sys.path:
86 + if 'dist-packages' in dist_path:
One of the goals here was to specifically pick up the python standard libraries. Restricting to dist-packages won't accomplish that unfortunately.

87 + if dist_path[0:dist_path.find('dist-packages') + 13] \
I prefer to avoid magic numbers

review: Needs Fixing

[lp:~psivaa/auto-upgrade-testing/bug1159671]

77. By Para Siva on 2013-04-05

Allowing to test the imports from all the possible paths in sys.path

[Para Siva (psivaa)]

OK, thanks. The restriction of testing the imports from dist-packages has now been removed. That removed the magic number changes too. It would be helpful to get the feedback on this. Thanks

review: Needs Resubmitting

Unmerged revisions

77. By Para Siva on 2013-04-05

Allowing to test the imports from all the possible paths in sys.path

76. By Para Siva on 2013-03-27

Formatting pep8 changes

75. By Para Siva on 2013-03-27

testing python imports from sys.path

=== modified file 'share/post_upgrade_tests/test_python_import.py'
--- share/post_upgrade_tests/test_python_import.py	2012-08-08 09:53:18 +0000
+++ share/post_upgrade_tests/test_python_import.py	2013-04-05 15:05:26 +0000
@@ -13,6 +13,7 @@
 import os
 import logging
 import subprocess
+import sys
 
 logging.basicConfig(
     filename='/tmp/%s.log' % os.path.basename(__file__)[:-3],
@@ -24,9 +25,9 @@
              "PAMmodule.so",
              "aomodule.so",
              "plannerui.so",
-             "desktopcouch", # needs a KeyringDaemon
-             "ropemacs", # just hangs
-             "keyring", # needs X
+             "desktopcouch",  # needs a KeyringDaemon
+             "ropemacs",  # just hangs
+             "keyring",  # needs X
              "invest",
              "Onboard",
              "goocanvasmodule.so",
@@ -34,8 +35,9 @@
 
 # If you want to test modules that require a display you'll have to install
 # xvfb in the base image
-XVFB_BIN='/usr/bin/xvfb-run'
-XVFB_OPT=[]
+XVFB_BIN = '/usr/bin/xvfb-run'
+XVFB_OPT = []
+
 
 def py_module_filter(pymodule):
     return not (
@@ -47,6 +49,7 @@
         pymodule in BLACKLIST
     )
 
+
 def get_module_from_path(path):
     f = os.path.basename(path)
     if path and os.path.exists(os.path.join(path, "__init__.py")):
@@ -60,6 +63,7 @@
     elif f.endswith(".so"):
         return f.split(".")[0]
 
+
 class TestPython(unittest.TestCase):
     # total imports
     total = 0
@@ -81,16 +85,19 @@
             return rc
 
         try:
-            cmd = ["python", "-c","import %s" % module]
+            cmd = ["python", "-c", "import %s" % module]
             self.total += 1
-            subprocess.check_call(cmd, stderr = self.stderr)
+            subprocess.check_call(cmd, stderr=self.stderr)
         except subprocess.CalledProcessError:
             try:
-                pkg = subprocess.check_output(["dpkg", "-S", os.path.realpath(path)])
+                pkg = subprocess.check_output(["dpkg", "-S",
+                                               os.path.realpath(path)])
                 self.failed.append((module, pkg.strip()))
-                logging.error('Import failed. Package providing this module: %s', pkg)
+                logging.error('Import failed. Package providing this \
+                                                        module: %s', pkg)
             except subprocess.CalledProcessError:
-                logging.error("Import of %s failed, and no package ships this module.", path)
+                logging.error("Import of %s failed, and no \
+                                       package ships this module.", path)
             rc = False
         return rc
 
@@ -99,8 +106,8 @@
         config = ConfigParser.SafeConfigParser()
         config.read('/usr/share/python/debian_defaults')
         self.default_version = config.get('DEFAULT', 'default-version')
-        self.distpackages = '/usr/lib/%s/dist-packages/' % self.default_version
-        self.stderr = open('/tmp/%s.stderr' % os.path.basename(__file__)[:-3],'w')
+        self.stderr = open('/tmp/%s.stderr' % os.path.basename
+                                                     (__file__)[:-3], 'w')
 
     def tearDown(self):
         self.stderr.close()
@@ -109,23 +116,30 @@
         '''Import python modules from /usr/lib/PYTHONVER/dist-packages/'''
         res = True
 
-        for module in filter(py_module_filter, os.listdir(self.distpackages)):
-            res &= self._try_import(os.path.join(self.distpackages, module))
+        for package_path in sys.path:
+            if os.path.exists(package_path):
+                for module in filter(py_module_filter,
+                                     os.listdir(package_path)):
+                    res &= self._try_import(os.path.join(package_path,
+                                                                module))
 
         logging.info('Modules imported: %d', self.total)
         if res:
             logging.info('No failure')
 
-        self.assertTrue(res, '%d module(s) failed to import' % len(self.failed))
+        self.assertTrue(res, '%d module(s) failed to import' %
+                                                     len(self.failed))
 
 if __name__ == '__main__':
     if 'DISPLAY' in os.environ:
         unittest.main()
     elif os.path.exists(XVFB_BIN):
-        logging.info("'%s' found and DISPLAY not set. Re-executing myself with xvfb")
-        cmd = [ XVFB_BIN ] + XVFB_OPT + [os.path.abspath(__file__)]
+        logging.info("'%s' found and DISPLAY not set. \
+                                           Re-executing myself with xvfb")
+        cmd = [XVFB_BIN] + XVFB_OPT + [os.path.abspath(__file__)]
         logging.info(cmd)
         subprocess.call(cmd)
     else:
-        logging.warning("'%s' not found and DISPLAY not set. Executing test without a display", XVFB_BIN)
+        logging.warning("'%s' not found and DISPLAY not set. Executing \
+                                            test without a display", XVFB_BIN)
         unittest.main()