Merge lp:~mvo/software-center/more-dep8-again into lp:software-center

[Michael Vogt]

Jibel investigated the test failures in the ADT environment here: https://plus.google.com/107403408442467283490/posts

This branch should address them and with the proxy he setup hopefully we see the tests all work now.

[lp:~mvo/software-center/more-dep8-again]

3131. By Michael Vogt on 2012-08-28

run-tests.sh: fail early with proper message if there is no http access available

[Gary Lasker (gary-lasker)]

Lets merge this and hopefully we are good to go. Thanks, mvo!

review: Approve

=== modified file 'debian/tests/control'
--- debian/tests/control	2012-08-15 11:48:31 +0000
+++ debian/tests/control	2012-08-28 13:19:23 +0000
@@ -1,4 +1,4 @@
 Tests: run-tests
-Depends: @, xvfb, python-coverage, python-mock, python3-aptdaemon.test, python-qt4, python-unittest2, python-lxml, pep8, pyflakes, iputils-ping, language-pack-en, gawk, update-manager, gnome-menus
+Depends: @, xvfb, python-coverage, python-mock, python3-aptdaemon.test, python-qt4, python-unittest2, python-lxml, pep8, pyflakes, iputils-ping, language-pack-en, gawk, update-manager, gnome-menus, curl
 
 

=== modified file 'debian/tests/run-tests'
--- debian/tests/run-tests	2012-08-17 13:37:45 +0000
+++ debian/tests/run-tests	2012-08-28 13:19:23 +0000
@@ -1,6 +1,19 @@
 #!/bin/sh
 set -e 
 
+# the default user in the adt env is "ubuntu"
+USER=ubuntu
+
+echo "Running as uid $(id -u)"
+
+# we don't like running as root in the adt environment
+if $(id $USER >/dev/null); then
+    if [ "$(id -u)" = "0" ]; then
+        echo "Switching to user $USER"
+        su -lc "cd $PWD; sh $0" $USER
+    fi
+fi
+
 if ! xvfb-run ./run-tests.sh; then
     # show all the failures for easier analyzing
     cat ./tests/output/*.FAIL

=== modified file 'run-tests.sh'
--- run-tests.sh	2012-08-17 13:37:45 +0000
+++ run-tests.sh	2012-08-28 13:19:23 +0000
@@ -39,6 +39,12 @@
     exit 1
 fi
 
+# check if basic http access works
+HTTP_URL=http://software-center.ubuntu.com
+if ! curl -s $HTTP_URL >/dev/null; then
+    echo "NEED curl and http access to $HTTP_URL"
+    exit 1
+fi
 
 # clear coverage data
 # coverage erase will not erase the files from --parallel-mode

=== modified file 'tests/test_database.py'
--- tests/test_database.py	2012-08-23 14:37:28 +0000
+++ tests/test_database.py	2012-08-28 13:19:23 +0000
@@ -224,7 +224,11 @@
         app = Application("Ubuntu Software Center Test", "software-center")
         details = app.get_details(db)
         self.assertNotEqual(details, None)
-        self.assertEqual(details.component, "main")
+        # mvo: disabled, we can reenable this once there is a static
+        #      apt rootdir and we do not rely on the test system to
+        #      have software-center from the main archive and not from
+        #      e.g. a custom repo like the ADT environment
+        #self.assertEqual(details.component, "main")
         self.assertEqual(details.pkgname, "software-center")
         # get the first document
         for doc in db:

=== modified file 'tests/test_dataprovider.py'
--- tests/test_dataprovider.py	2012-07-23 11:29:32 +0000
+++ tests/test_dataprovider.py	2012-08-28 13:19:23 +0000
@@ -29,11 +29,11 @@
         self.assertTrue(len(self.provider.db) > 100)
 
     def test_get_details(self):
-        result = self.provider.GetAppDetails("", "software-center")
+        result = self.provider.GetAppDetails("", "gedit")
         self.assertEqual(result["component"], "main")
-        self.assertEqual(result["icon"], "softwarecenter")
-        self.assertEqual(result["name"], "software-center")
-        self.assertEqual(result["pkgname"], "software-center")
+        self.assertEqual(result["icon"], "accessories-text-editor")
+        self.assertEqual(result["name"], "gedit")
+        self.assertEqual(result["pkgname"], "gedit")
 
 
 if __name__ == "__main__":