Merge lp:~laney/software-center/make-tests-pass into lp:software-center

[Iain Lane]

Disable some tests and fix up some others to get them in a passing state.

Disable some tests and fix up some others to get them in a passing state.

[lp:~laney/software-center/make-tests-pass]

3319. By Iain Lane on 2013-07-12

Remove disabled python-coverage code from test runner

[dobey (dobey)]

61 -VERSION = '99.12'
62 +VERSION = '13.05'

This should not be changed here.

review: Needs Fixing

[Iain Lane (laney)]

On Fri, Jul 12, 2013 at 06:42:27PM -0000, Rodney Dawes wrote:
> Review: Needs Fixing
>
> 61 -VERSION = '99.12'
> 62 +VERSION = '13.05'

Uh, I don't think I did that manually...

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[lp:~laney/software-center/make-tests-pass]

3320. By Iain Lane on 2013-07-12

Don't change version in setup.py

[dobey (dobey)]

review: Approve

=== modified file 'run-tests.sh'
--- run-tests.sh	2013-03-22 13:33:41 +0000
+++ run-tests.sh	2013-07-12 18:54:28 +0000
@@ -4,7 +4,7 @@
 
 TESTS_DIR="tests"
 
-dpkg-checkbuilddeps -d 'python-coverage, xvfb, python-mock, python-unittest2,
+dpkg-checkbuilddeps -d 'xvfb, python-mock, python-unittest2,
                        python3-aptdaemon.test, python-lxml, python-qt4'
 
 if [ ! -e /var/lib/apt-xapian-index/index ]; then
@@ -19,12 +19,8 @@
     exit 1
 fi
 
-# clear coverage data
-# coverage erase will not erase the files from --parallel-mode
-rm -f $TESTS_DIR/.coverage*
-
 ./setup.py build
-# run with xvfb and coverage
+# run with xvfb
 
 XVFB_CMDLINE=""
 
@@ -36,17 +32,7 @@
     XVFB_CMDLINE="$XVFB -a"
 fi
 
-COVERAGE_CMDLINE=""
-COVERAGE=$(which python-coverage)
-if [ $COVERAGE ]; then
-    # If you are measuring coverage in a multi-process program, or across a
-    # number of machines, you’ll want the --parallel-mode switch to keep the
-    # data separate during measurement. See Combining data files below.
-    ##COVERAGE_CMDLINE="$COVERAGE run --parallel-mode"
-    echo "No coverage for now."
-fi
-
-PYTHON="$XVFB_CMDLINE $COVERAGE_CMDLINE python -m unittest"
+PYTHON="$XVFB_CMDLINE python -m unittest"
 
 # and record failures here
 OUTPUT=$TESTS_DIR"/output"

=== modified file 'setup.py'
--- setup.py	2013-05-24 17:39:02 +0000
+++ setup.py	2013-07-12 18:54:28 +0000
@@ -17,8 +17,6 @@
 
 import platform
 import glob
-import re
-from subprocess import call
 import sys
 
 from DistUtilsExtra.auto import setup

=== modified file 'softwarecenter/db/pkginfo_impl/packagekit.py'
--- softwarecenter/db/pkginfo_impl/packagekit.py	2012-12-14 16:44:25 +0000
+++ softwarecenter/db/pkginfo_impl/packagekit.py	2013-07-12 18:54:28 +0000
@@ -244,9 +244,9 @@
         )
         if not res:
             return []
-        return [p.get_name()
-                for p in res.get_package_array()
-                if p.get_name() != pkg.name]
+        return [package.get_name()
+                for package in res.get_package_array()
+                if package.get_name() != pkg.name]
 
     def get_packages_removed_on_install(self, pkg):
         """ Returns a package names list of dependencies
@@ -261,10 +261,10 @@
         )
         if not res:
             return []
-        return [p.get_name()
-                for p in res.get_package_array()
-                if (p.get_name() != pkg.name)
-                and p.get_info() == packagekit.InfoEnum.INSTALLED]
+        return [package.get_name()
+                for package in res.get_package_array()
+                if (package.get_name() != pkg.name)
+                and package.get_info() == packagekit.InfoEnum.INSTALLED]
 
     def query_total_size_on_install(self, pkgname,
                                     addons_install=None,

=== modified file 'softwarecenter/db/update.py'
--- softwarecenter/db/update.py	2013-05-02 21:35:40 +0000
+++ softwarecenter/db/update.py	2013-07-12 18:54:28 +0000
@@ -427,9 +427,9 @@
                 if countrycode in blacklist:
                     if countrycode in whitelist:
                         LOG.debug("%r.make_doc: %r black AND whitelisted for "
-                                  "region %r. Treating as blacklisted.", 
+                                  "region %r. Treating as blacklisted.",
                                   self.__class__.__name__, name, countrycode)
-                        
+
                     LOG.debug("%r.make_doc: skipping region restricted app %r "
                              "(blacklisted)", self.__class__.__name__, name)
                     return
@@ -933,6 +933,7 @@
     def desktopf(self):
         return self._filename
 
+
 class ScopeConfigParser(DesktopConfigParser):
     """Thin wrapper to handle Scope files."""
 
@@ -949,6 +950,7 @@
         if self.has_option(self.SCOPE, key):
             return self.get(self.SCOPE, key)
 
+
 def ascii_upper(key):
     """Translate an ASCII string to uppercase
     in a locale-independent manner."""

=== modified file 'softwarecenter/ui/gtk3/aptd_gtk3.py'
--- softwarecenter/ui/gtk3/aptd_gtk3.py	2012-12-14 16:44:25 +0000
+++ softwarecenter/ui/gtk3/aptd_gtk3.py	2013-07-12 18:54:28 +0000
@@ -61,7 +61,6 @@
 
 if __name__ == "__main__":
     from softwarecenter.backend.installbackend import get_install_backend
-    from softwarecenter.ui.gtk3.aptd_gtk3 import InstallBackendUI
     from mock import Mock
 
     aptd = get_install_backend()

=== modified file 'softwarecenter/ui/gtk3/session/displaystate.py'
--- softwarecenter/ui/gtk3/session/displaystate.py	2012-11-28 17:36:38 +0000
+++ softwarecenter/ui/gtk3/session/displaystate.py	2013-07-12 18:54:28 +0000
@@ -65,11 +65,11 @@
 
     def __str__(self):
         s = utf8('%s %s "%s" %s %s') % \
-                                  (self.category,
-                                   self.subcategory,
-                                   self.search_term,
-                                   self.application,
-                                   self.channel)
+                (self.category,
+                 self.subcategory,
+                 self.search_term,
+                 self.application,
+                 self.channel)
         return s
 
     def copy(self):

=== modified file 'tests/data/aptroot/etc/apt/sources.list'
--- tests/data/aptroot/etc/apt/sources.list	2011-01-25 17:24:14 +0000
+++ tests/data/aptroot/etc/apt/sources.list	2013-07-12 18:54:28 +0000
@@ -1,3 +1,3 @@
-deb http://archive.ubuntu.com/ubuntu lucid main
-deb http://de.archive.ubuntu.com/ubuntu lucid main
-deb http://ppa.launchpad.net/ubuntu-mozilla-daily/ppa/ubuntu lucid main
+deb http://archive.ubuntu.com/ubuntu precise main
+deb http://de.archive.ubuntu.com/ubuntu precise main
+deb http://ppa.launchpad.net/ubuntu-mozilla-daily/ppa/ubuntu precise main

=== renamed file 'tests/test_config.py' => 'tests/disabled_test_config.py'
=== renamed file 'tests/test_dataprovider.py' => 'tests/disabled_test_dataprovider.py'
=== renamed file 'tests/test_description_norm.py' => 'tests/disabled_test_description_norm.py'
=== renamed file 'tests/test_pep8.py' => 'tests/disabled_test_pep8.py'
=== renamed file 'tests/test_where_is_it.py' => 'tests/disabled_test_where_is_it.py'
=== renamed file 'tests/gtk3/test_catview.py' => 'tests/gtk3/disabled_test_catview.py'
=== modified file 'tests/test_database.py'
--- tests/test_database.py	2013-03-28 07:55:42 +0000
+++ tests/test_database.py	2013-07-12 18:54:28 +0000
@@ -1,5 +1,4 @@
 import apt
-import platform
 import os
 import re
 import tempfile
@@ -146,7 +145,7 @@
                 self.assertIsInstance(value.num, long)
                 self.assertIsInstance(value.value, basestring)
 
-    @unittest.skipIf(platform.dist()[2] == "precise", "needs quantal or later")
+    @unittest.skip("Unreliable: incorrect indices get downloaded")
     def test_update_from_var_lib_apt_lists(self):
         # ensure we index with german locales to test i18n
         os.environ["LANGUAGE"] = "de"