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

Proposed by dobey on 2013-08-01
Status: Merged
Approved by: dobey on 2013-08-01
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) 2013-08-01 Approve on 2013-08-01
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.
Mike McCracken (mikemc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'control'
2--- control 2013-02-26 21:27:25 +0000
3+++ control 2013-08-01 18:57:30 +0000
4@@ -21,7 +21,6 @@
5 Standards-Version: 3.8.4
6 X-Python-Version: >= 2.7
7 Homepage: https://launchpad.net/software-center
8-XS-Testsuite: autopkgtest
9
10 Package: software-center
11 Architecture: all
12
13=== removed directory 'tests'
14=== removed file 'tests/control'
15--- tests/control 2013-02-26 21:27:25 +0000
16+++ tests/control 1970-01-01 00:00:00 +0000
17@@ -1,4 +0,0 @@
18-Tests: run-tests
19-Depends: @, 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
20-
21-
22
23=== removed file 'tests/run-tests'
24--- tests/run-tests 2013-02-26 21:27:25 +0000
25+++ tests/run-tests 1970-01-01 00:00:00 +0000
26@@ -1,37 +0,0 @@
27-#!/bin/sh
28-exec 2>&1
29-set -ex
30-
31-# the default user in the adt env is "ubuntu"
32-USER=ubuntu
33-
34-echo "Running as uid $(id -u)"
35-unset TMPDIR
36-
37-# ensure we have a a-x-i index for the tests, this assumes we can
38-# run sudo without PW in the test environment (which is possible
39-# with the adt testbed created from the auto-package-testing scripts)
40-if [ ! -e /var/lib/apt-xapian-index/index ]; then
41- sudo update-apt-xapian-index
42-fi
43-
44-# we don't like running as root in the adt environment
45-if $(id $USER >/dev/null); then
46- if [ "$(id -u)" = "0" ]; then
47- # create a apt-xapian-index for the tests
48- update-apt-xapian-index
49- # the ADT basedir is 0700 so non-root have a hard time
50- ADT_BASEDIR=$ADTTMP/../..
51- echo "FIXING owner in ${ADT_BASEDIR} to user $USER"
52- chown -R $USER ${ADT_BASEDIR}
53- echo "Switching to user $USER"
54- su -lc "cd $PWD; sh $0" $USER
55- fi
56-fi
57-
58-if ! xvfb-run ./run-tests.sh; then
59- # show all the failures for easier analyzing
60- cat ./tests/output/*.FAIL
61- exit 1
62-fi
63-

Subscribers

People subscribed via source and target branches