Canonical SSO provider

Merge lp:~jml/canonical-identity-provider/acceptance-script into lp:canonical-identity-provider/release

  1. acceptance-script
  2. Merge into trunk
Proposed by Jonathan Lange
Status: Merged
Approved by: Jonathan Lange
Approved revision: no longer in the source branch.
Merged at revision: 602
Proposed branch: lp:~jml/canonical-identity-provider/acceptance-script
Merge into: lp:canonical-identity-provider/release
Diff against target: 12 lines (+1/-1)
1 file modified
scripts/run-acceptance-tests (+1/-1)
To merge this branch: bzr merge lp:~jml/canonical-identity-provider/acceptance-script
Reviewer Review Type Date Requested Status
Jonathan Lange (community) Approve
Review via email: mp+143151@code.launchpad.net

Commit message

Link config files properly in acceptance tests.

Description of the change

Link config file properly.

To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

Rubberstamp

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/run-acceptance-tests'
2--- scripts/run-acceptance-tests 2013-01-08 13:56:32 +0000
3+++ scripts/run-acceptance-tests 2013-01-14 17:30:28 +0000
4@@ -42,7 +42,7 @@
5
6 # Set up the correct Django configuration.
7 rm django_project/local.cfg
8-ln -s local.cfg-${TARGET} django_project/local.cfg
9+ln -s scripts/local.cfg-${TARGET} django_project/local.cfg
10
11 # clean old results
12 rm -rf results/*