Merge lp:~dobey/software-center/drop-pkg-tests into lp:software-center/packaging-dailies

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 4
Merged at revision: 4
Proposed branch: lp:~dobey/software-center/drop-pkg-tests
Merge into: lp:software-center/packaging-dailies
Diff against target: 63 lines (+0/-42)
3 files modified
control (+0/-1)
tests/control (+0/-4)
tests/run-tests (+0/-37)
To merge this branch: bzr merge lp:~dobey/software-center/drop-pkg-tests
Reviewer Review Type Date Requested Status
Mike McCracken (community) Approve
Review via email: mp+178146@code.launchpad.net

Commit message

Drop the autopkgtest config, as it is broken and has never worked.

To post a comment you must log in.
Revision history for this message
Mike McCracken (mikemc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'control'
--- control 2013-02-26 21:27:25 +0000
+++ control 2013-08-01 18:57:30 +0000
@@ -21,7 +21,6 @@
21Standards-Version: 3.8.421Standards-Version: 3.8.4
22X-Python-Version: >= 2.722X-Python-Version: >= 2.7
23Homepage: https://launchpad.net/software-center23Homepage: https://launchpad.net/software-center
24XS-Testsuite: autopkgtest
2524
26Package: software-center25Package: software-center
27Architecture: all26Architecture: all
2827
=== removed directory 'tests'
=== removed file 'tests/control'
--- tests/control 2013-02-26 21:27:25 +0000
+++ tests/control 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
1Tests: run-tests
2Depends: @, xvfb, python-coverage, python-mock, python3-aptdaemon.test, python-qt4, python-unittest2, python-lxml, pep8, pyflakes, iputils-ping, language-pack-en, language-pack-de, gawk, update-manager, gnome-menus, curl
3
4
50
=== removed file 'tests/run-tests'
--- tests/run-tests 2013-02-26 21:27:25 +0000
+++ tests/run-tests 1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
1#!/bin/sh
2exec 2>&1
3set -ex
4
5# the default user in the adt env is "ubuntu"
6USER=ubuntu
7
8echo "Running as uid $(id -u)"
9unset TMPDIR
10
11# ensure we have a a-x-i index for the tests, this assumes we can
12# run sudo without PW in the test environment (which is possible
13# with the adt testbed created from the auto-package-testing scripts)
14if [ ! -e /var/lib/apt-xapian-index/index ]; then
15 sudo update-apt-xapian-index
16fi
17
18# we don't like running as root in the adt environment
19if $(id $USER >/dev/null); then
20 if [ "$(id -u)" = "0" ]; then
21 # create a apt-xapian-index for the tests
22 update-apt-xapian-index
23 # the ADT basedir is 0700 so non-root have a hard time
24 ADT_BASEDIR=$ADTTMP/../..
25 echo "FIXING owner in ${ADT_BASEDIR} to user $USER"
26 chown -R $USER ${ADT_BASEDIR}
27 echo "Switching to user $USER"
28 su -lc "cd $PWD; sh $0" $USER
29 fi
30fi
31
32if ! xvfb-run ./run-tests.sh; then
33 # show all the failures for easier analyzing
34 cat ./tests/output/*.FAIL
35 exit 1
36fi
37

Subscribers

People subscribed via source and target branches