1
=== modified file 'jenkins/testconfig.py'
2
--- jenkins/testconfig.py	2014-07-25 22:15:49 +0000
3
+++ jenkins/testconfig.py	2014-07-31 21:33:54 +0000
4
@@ -45,6 +45,18 @@
5
45
        self.app = app
45
        self.app = app
6
46
46
7
47
47
8
48
class AutopkgTest(Test):
9
49
    def __init__(self, name, branch, click):
10
50
        Test.__init__(self, name)
11
51
        # In all known cases, the app and name are equivalent
12
52
        self.app = name
13
53
        # Branch is needed until autpkgtest supports downloading
14
54
        # from the branch in the manifest file
15
55
        self.branch = branch
16
56
        # This is the click name as returned by 'click list'
17
57
        self.click = click
18
58
19
59
20
48
TESTSUITES = [
60
TESTSUITES = [
21
49
    Test('default'),
61
    Test('default'),
22
50
]
62
]
23
@@ -77,6 +89,10 @@
24
77
           ['ubuntu-system-settings-online-accounts-autopilot']),
89
           ['ubuntu-system-settings-online-accounts-autopilot']),
25
78
]
90
]
26
79
TESTSUITES += [
91
TESTSUITES += [
27
92
    AutopkgTest('reminders', 'lp:reminders-app',
28
93
                'com.ubuntu.reminders'),
29
94
]
30
95
TESTSUITES += [
31
80
    Test('click_image_tests'),
96
    Test('click_image_tests'),
32
81
    Test('sdk'),
97
    Test('sdk'),
33
82
    Test('security'),
98
    Test('security'),
34
@@ -135,6 +151,7 @@
35
135
151
36
136
def _handle_ap_apps(args):
152
def _handle_ap_apps(args):
37
137
    tests = _get_tests(APTest, args.image_type)
153
    tests = _get_tests(APTest, args.image_type)
38
154
    tests += _get_tests(AutopkgTest, args.image_type)
39
138
    tests = _split_work(tests, args.total_workers, args.worker)
155
    tests = _split_work(tests, args.total_workers, args.worker)
40
139
    print(' '.join([t.app for t in tests]))
156
    print(' '.join([t.app for t in tests]))
41
140
157
42
@@ -149,6 +166,18 @@
43
149
    print(' '.join(pkgs))
166
    print(' '.join(pkgs))
44
150
167
45
151
168
46
169
def _handle_autopkg_apps(args):
47
170
    tests = _get_tests(AutopkgTest, args.image_type)
48
171
    for test in tests:
49
172
        if test.app == args.branch:
50
173
            print(test.branch)
51
174
            return
52
175
        elif test.app == args.click:
53
176
            print(test.click)
54
177
            return
55
178
    print(' '.join([t.app for t in tests]))
56
179
57
180
58
152
def get_tests_mako(common_tests):
181
def get_tests_mako(common_tests):
59
153
    tests = common_tests
182
    tests = common_tests
60
154
    tests.extend([DevTest('suspend-blocker', 'mako-01')])
183
    tests.extend([DevTest('suspend-blocker', 'mako-01')])
61
@@ -188,6 +217,16 @@
62
188
    p.add_argument('-w', '--worker', type=int, default=0,
217
    p.add_argument('-w', '--worker', type=int, default=0,
63
189
                   help='The worker to allocate applications for testing to.')
218
                   help='The worker to allocate applications for testing to.')
64
190
219
65
220
    p = sub.add_parser('adt', help='List autopkgtest application names')
66
221
    p.set_defaults(func=_handle_autopkg_apps)
67
222
    g = p.add_mutually_exclusive_group()
68
223
    g.add_argument('-i', '--image-type',
69
224
                   help='Return list of test configured for an image type.')
70
225
    g.add_argument('-b', '--branch',
71
226
                   help='Return the branch needed for an autopkgtest app.')
72
227
    g.add_argument('-c', '--click',
73
228
                   help='Return the click name for an autopkgtest app.')
74
229
75
191
    p = sub.add_parser('packages', help='List packages required for autopilot')
230
    p = sub.add_parser('packages', help='List packages required for autopilot')
76
192
    p.set_defaults(func=_handle_ap_packages)
231
    p.set_defaults(func=_handle_ap_packages)
77
193
    g = p.add_mutually_exclusive_group()
232
    g = p.add_mutually_exclusive_group()
78
194
233
79
=== modified file 'scripts/run-autopilot-tests.sh'
80
--- scripts/run-autopilot-tests.sh	2014-07-01 21:31:23 +0000
81
+++ scripts/run-autopilot-tests.sh	2014-07-31 21:33:54 +0000
82
@@ -76,7 +76,37 @@
83
76
	[ -d $odir ] && rm -rf $odir
76
	[ -d $odir ] && rm -rf $odir
84
77
	mkdir -p $odir || return 1
77
	mkdir -p $odir || return 1
85
78
78
86
79
	# The source_dir is needed for adt-run and click packages
87
80
	source_dir=${RESDIR}/source_dir
88
81
	[ -d $source_dir ] && rm -rf $source_dir
89
82
90
79
	system_settle before $odir
83
	system_settle before $odir
91
84
92
85
	adt_list=$(${BASEDIR}/jenkins/testconfig.py adt)
93
86
	if echo "$adt_list" | grep "$app" ; then
94
87
		echo "$app is executed with adt-run"
95
88
		test_app_adt $source_dir
96
89
	else
97
90
		echo "$app is executed with phablet-test-run"
98
91
		test_app_ptr
99
92
	fi
100
93
101
94
	system_settle after $odir
102
95
103
96
	if echo "$adt_list" | grep "$app" ; then
104
97
		echo "Clean up for adt tests"
105
98
		[ -d $source_dir ] && rm -rf $source_dir
106
99
	else
107
100
		echo "Clean up for ptr tests"
108
101
		setup_test $app teardown $odir
109
102
	fi
110
103
	if [ -f ${odir}/test_results.subunit ] ; then
111
104
		cat ${odir}/test_results.subunit | subunit2junitxml > ${odir}/test_results.xml
112
105
	fi
113
106
	${BASEDIR}/scripts/combine_results ${odir}
114
107
}
115
108
116
109
test_app_ptr() {
117
80
	phablet-config autopilot --dbus-probe enable || \
110
	phablet-config autopilot --dbus-probe enable || \
118
81
		(log_error "'autopilot dbus-probe enable' failed"; return 1)
111
		(log_error "'autopilot dbus-probe enable' failed"; return 1)
119
82
112
120
@@ -94,13 +124,40 @@
121
94
		-a /var/crash -a /home/phablet/.cache/upstart \
124
		-a /var/crash -a /home/phablet/.cache/upstart \
122
95
                -a /var/log/syslog -a /var/log/kern.log \
125
                -a /var/log/syslog -a /var/log/kern.log \
123
96
		-v $app || true
126
		-v $app || true
124
127
}
125
97
128
130
98
	system_settle after $odir
129
test_app_adt() {
131
99
	setup_test $app teardown $odir
130
	# Here's the basic command for running adt tests for a click package.
132
100
	if [ -f ${odir}/test_results.subunit ] ; then
131
	# Due to limitation in adt-run, the source dir has to be manually
133
101
		cat ${odir}/test_results.subunit | subunit2junitxml > ${odir}/test_results.xml
132
	# checked out.
134
133
	# adt-run -o reminders.out --click-source=reminders-app \
135
134
	#     --click=com.ubuntu.reminders --- \
136
135
	#     ssh -s /usr/share/autopkgtest/ssh-setup/adb
137
136
	click_source_dir=$1
138
137
	click_name=$(${BASEDIR}/jenkins/testconfig.py adt --click $app)
139
138
	# TODO: check out the correct revno based on the click manifest
140
139
	click_source=$(${BASEDIR}/jenkins/testconfig.py adt --branch $app)
141
140
	bzr branch $click_source $click_source_dir
142
141
	adt-run -o ${odir} --click-source=$click_source_dir \
143
142
		--click=$click_name --- \
144
143
		ssh -s /usr/share/autopkgtest/ssh-setup/adb
145
144
	adt_ret=$?
146
145
	echo "adt-run returned: $adt_ret"
147
146
	# adt-run does not produce any pretty xml results.
148
147
	# As a workaround, construct an xml file that can at least be pulled
149
148
	# into the dashboard and contains data from any test failures.
150
149
	if [ $adt_ret -eq 0 ] || [ $adt_ret -eq 2 ] ; then
151
150
		# adt-run passed!
152
151
		# non-failure exit status:
153
152
		#   0 == all tests passed
154
153
		#   2 == at least one test skipped
155
154
		echo "<testsuite errors=\"0\" failures=\"0\" tests=\"1\"><testcase classname=\"$app\" name=\"adt-run\"></testcase></testsuite>" >> ${odir}/test_results.xml
156
155
	else
157
156
		# The adt run failed. The log file will contain the logging
158
157
		# from the test failures as well as any adt-run failures.
159
158
		adt_log=`cat ${odir}/log`
160
159
		echo "<testsuite errors=\"1\" failures=\"0\" tests=\"1\"><testcase classname=\"$app\" name=\"adt-run\"><failure type=\"adt-run.failure\">adt-run encountered at least one failed test: <![CDATA[\n$adt_log\n\n]]></failure></testcase></testsuite>" >> ${odir}/test_results.xml
161
102
	fi
160
	fi
162
103
	${BASEDIR}/scripts/combine_results ${odir}
163
104
}
161
}
164
105
162
165
106
reboot_wait() {
163
reboot_wait() {
Status:	Needs review
Proposed branch:	lp:~fginther/ubuntu-test-cases/add-reminders
Merge into:	lp:ubuntu-test-cases/touch
Diff against target:	165 lines (+101/-5) 2 files modified jenkins/testconfig.py (+39/-0) scripts/run-autopilot-tests.sh (+62/-5)
To merge this branch:	bzr merge lp:~fginther/ubuntu-test-cases/add-reminders
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Nicholas Skaggs (community)		Needs Fixing on 2014-08-20
Paul Larson		Needs Fixing on 2014-08-01
Francis Ginther		Needs Resubmitting on 2014-07-31
Andy Doan (community)	2014-07-10	Approve on 2014-07-10
Martin Pitt		Pending
Review via email: mp+226281@code.launchpad.net