Merge lp:~jml/canonical-identity-provider/disable-pre-merge-tests into lp:canonical-identity-provider/release

Proposed by Jonathan Lange
Status: Merged
Approved by: James Westby
Approved revision: no longer in the source branch.
Merged at revision: 561
Proposed branch: lp:~jml/canonical-identity-provider/disable-pre-merge-tests
Merge into: lp:canonical-identity-provider/release
Diff against target: 16 lines (+6/-0)
1 file modified
tarmac_tests.sh (+6/-0)
To merge this branch: bzr merge lp:~jml/canonical-identity-provider/disable-pre-merge-tests
Reviewer Review Type Date Requested Status
James Westby (community) Approve
Review via email: mp+140272@code.launchpad.net

Commit message

Disable pre-merge tests.

Description of the change

We've got tarmac running for these branches on jenkins.errormessaging.com,
but there are complications with getting the tests actually running (in a
nutshell, these tests assume that there's a postgresql database up and
running, with specific configuration settings).

As such, we're going to disable the tarmac tests for now. We'll re-enable
them once we've got pre-merge tests working.

To post a comment you must log in.
Revision history for this message
Ubuntu One Server Tarmac Bot (ubuntuone-server-tarmac) wrote :

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0, Needs Fixing == 0, Needs Information == 0, Resubmit == 0, Pending == 0. Got: 1 Pending.

Revision history for this message
James Westby (james-w) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tarmac_tests.sh'
2--- tarmac_tests.sh 2012-12-13 11:41:38 +0000
3+++ tarmac_tests.sh 2012-12-17 18:44:20 +0000
4@@ -1,6 +1,12 @@
5 #!/bin/sh
6 # How the tests are run in Jenkins by Tarmac
7
8+# XXX: With the death of razorgirl, we have yet to get
9+# jenkins.errormessaging.com set up to correctly run the SSO tests. As such,
10+# we'll disable the tests for now.
11+
12+exit 0
13+
14 set -e
15
16 LOG_FILE=log