Merge lp:~mvo/gdebi/test-fixes into lp:gdebi

[Michael Vogt]

This branch fixes a testfailure during build and uses "python setup.py test" to run the tests.

[Dimitri John Ledkov (xnox)]

Hm, in sbuild I get a test error:
======================================================================
ERROR: test_lintian (tests.test_gdebi_gtk_lintian.GDebiGtkTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/mock.py", line 1210, in patched
    return func(*args, **keywargs)
  File "/«PKGBUILDDIR»/tests/test_gdebi_gtk_lintian.py", line 51, in test_lintian
    if gdebi._lintian_exit_status is not None:
AttributeError: 'GDebiGtk' object has no attribute '_lintian_exit_status'

=== modified file 'GDebi/GDebiCommon.py'
--- GDebi/GDebiCommon.py	2014-02-28 22:11:44 +0000
+++ GDebi/GDebiCommon.py	2014-03-01 08:24:22 +0000
@@ -36,7 +36,13 @@
 )
 
 
-if sys.version_info[0] == 2:
+if sys.version_info[0] == 3:
+    from gettext import gettext as _
+    def py3utf8(s):
+        return s
+    utf8 = py3utf8
+    unicode = str
+else:
     def _(str):
         return utf8(gettext.gettext(str))
 
@@ -50,11 +56,6 @@
             # assume latin1 as fallback
             return unicode(str, 'latin1')
     utf8 = py2utf8
-else:
-    from gettext import gettext as _
-    def py3utf8(s):
-        return s
-    utf8 = py3utf8
 
 	  
 class GDebiCommon(object):
 
=== modified file 'GDebi/GDebiKDE.py'
--- GDebi/GDebiKDE.py	2014-01-02 13:43:12 +0000
+++ GDebi/GDebiKDE.py	2014-03-01 08:24:22 +0000
@@ -65,7 +65,7 @@
 
 
 def __(catalog,str):
-    return unicode(gettext.dgettext(catalog, str), 'UTF-8')
+    return utf8(gettext.dgettext(catalog, str))
 
 def loadUi(file, parent):
     """load local file if possible else use installed file"""
 
=== modified file 'debian/control'
--- debian/control	2014-01-02 13:35:07 +0000
+++ debian/control	2014-03-01 08:24:22 +0000
@@ -15,7 +15,8 @@
                python-setuptools,
                intltool,
                xvfb,
-               xauth
+               xauth,
+               pyflakes
 X-Python-Version: >= 2.6
 Standards-Version: 3.9.5
 Vcs-Bzr: https://code.launchpad.net/~gdebi-developers/gdebi/trunk
 
=== modified file 'debian/rules'
--- debian/rules	2014-02-28 22:12:29 +0000
+++ debian/rules	2014-03-01 08:24:22 +0000
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+PYTHON=python2
+
 %:
 	dh $@ --with python2
 
@@ -8,7 +10,7 @@
 	rm -rf build GDebi/Version.py po/mo
 
 override_dh_auto_test:
-	xvfb-run -a nosetests
+	xvfb-run -a $(PYTHON) setup.py test
 
 override_dh_auto_install:
 	dh_auto_install -- --install-scripts=/usr/share/gdebi \
 
=== modified file 'tests/test_gdebi_gtk_lintian.py'
--- tests/test_gdebi_gtk_lintian.py	2012-11-30 19:39:34 +0000
+++ tests/test_gdebi_gtk_lintian.py	2014-03-01 08:24:22 +0000
@@ -10,7 +10,8 @@
 from GDebi.GDebiGtk import GDebiGtk
 from GDebi.GDebiCommon import GDebiCommon
 
-EXPECTED_LINTIAN_OUTPUT = """E: error-package: file-in-etc-not-marked-as-conffile etc/foo
+EXPECTED_LINTIAN_OUTPUT = """E: error-package: changelog-file-missing-in-native-package
+E: error-package: file-in-etc-not-marked-as-conffile etc/foo
 E: error-package: control-file-has-bad-owner postinst egon/egon != root/root
 E: error-package: no-copyright-file
 E: error-package: package-has-no-description
@@ -56,7 +57,8 @@
         start = buf.get_start_iter()
         end = buf.get_end_iter()
         lintian_output = buf.get_text(start, end, False)
-        self.assertEqual(lintian_output.strip(), EXPECTED_LINTIAN_OUTPUT)
+        self.maxDiff = None
+        self.assertMultiLineEqual(lintian_output.strip(), EXPECTED_LINTIAN_OUTPUT)
 
 
 if __name__ == "__main__":