Merge lp:~canonical-ca-hackers/ubuntu-webcatalog/fix-test-failure into lp:ubuntu-webcatalog

Proposed by Łukasz Czyżykowski
Status: Merged
Approved by: Łukasz Czyżykowski
Approved revision: 173
Merged at revision: 172
Proposed branch: lp:~canonical-ca-hackers/ubuntu-webcatalog/fix-test-failure
Merge into: lp:ubuntu-webcatalog
Diff against target: 24 lines (+2/-1)
2 files modified
fabtasks/bootstrap.py (+1/-1)
src/webcatalog/tests/test_preflight.py (+1/-0)
To merge this branch: bzr merge lp:~canonical-ca-hackers/ubuntu-webcatalog/fix-test-failure
Reviewer Review Type Date Requested Status
Canonical Consumer Applications Hackers Pending
Review via email: mp+128862@code.launchpad.net

Commit message

Fixed latest test failure caused by the new django-preflight

Description of the change

Fixes latest test failure caused by the new django-preflight

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'fabtasks/bootstrap.py'
--- fabtasks/bootstrap.py 2012-04-18 09:37:51 +0000
+++ fabtasks/bootstrap.py 2012-10-10 06:33:22 +0000
@@ -24,7 +24,7 @@
2424
25def virtualenv_create():25def virtualenv_create():
26 local("rm -rf virtualenv/*")26 local("rm -rf virtualenv/*")
27 local("virtualenv --no-site-packages virtualenv", capture=False)27 local("virtualenv virtualenv")
2828
2929
30def install_requirements():30def install_requirements():
3131
=== modified file 'src/webcatalog/tests/test_preflight.py'
--- src/webcatalog/tests/test_preflight.py 2012-06-27 17:03:15 +0000
+++ src/webcatalog/tests/test_preflight.py 2012-10-10 06:33:22 +0000
@@ -78,6 +78,7 @@
78 'openid',78 'openid',
79 'piston',79 'piston',
80 'Django',80 'Django',
81 'Platform',
81 'preflight',82 'preflight',
82 ])83 ])
83 expected_checks = set([84 expected_checks = set([

Subscribers

People subscribed via source and target branches