Merge lp://qastaging/~lutostag/juju-deployer/populate-first+test-fixes into lp://qastaging/~raharper/juju-deployer/populate-first

Proposed by Greg Lutostanski
Status: Needs review
Proposed branch: lp://qastaging/~lutostag/juju-deployer/populate-first+test-fixes
Merge into: lp://qastaging/~raharper/juju-deployer/populate-first
Diff against target: 36 lines (+8/-4)
2 files modified
deployer/tests/test_charm.py (+5/-2)
deployer/tests/test_diff.py (+3/-2)
To merge this branch: bzr merge lp://qastaging/~lutostag/juju-deployer/populate-first+test-fixes
Reviewer Review Type Date Requested Status
Ryan Harper Needs Fixing
Review via email: mp+253833@code.qastaging.launchpad.net

Description of the change

Changes I needed to make the tests pass when building packages for precise in sbuild.

To post a comment you must log in.
Revision history for this message
Kapil Thangavelu (hazmat) wrote :

offline condition should probably be using test decorator to skip test conditionally

Revision history for this message
Ryan Harper (raharper) wrote :

Look at trunk for the fix for test_diff.py, while not using a decorator, it checks for TEST_OFFLINE in setUp and tearDown() which I think fixes the issue you see.

the git changes look fine.

review: Needs Fixing

Unmerged revisions

146. By Greg Lutostanski

fix diff test to work offline

145. By Greg Lutostanski

fix git tests by adding user.name config

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: