← Back to branch summary

~jcsackett/charmworld/bac-tag-constraints

« back to all changes in this revision

Viewing changes to charmworld/jobs/tests/test_ingest.py

  • Committer: Aaron Bentley
  • Date: 2013-07-17 21:40:06 UTC
  • mto: This revision was merged to the branch mainline in revision 317.
  • Revision ID: aaron@canonical.com-20130717214006-g0touu8l5l3sh6y3
Fix test failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
charmworld/jobs/tests/test_ingest.py
236
236
        'charmworld.jobs.ingest.checkout_branch',
237
237
        side_effect=checkout_charm_mock
238
238
    ) as checkout_branch:
239
 
        with temp_dir() as working_dir:
 
239
        with bzr_isolation() as working_dir:
240
240
            try:
241
241
                yield checkout_branch, working_dir
242
242
            finally:
329
329
        job.setup(self.db)
330
330
        bundle_data = factory.get_payload_json()
331
331
        # We use multiple commits to show that the latest revno is used.
332
 
        with temp_dir() as source_branch_dir:
 
332
        with bzr_isolation() as source_branch_dir:
333
333
            wt = BzrDir.create_standalone_workingtree(source_branch_dir)
334
334
            for x in range(7):
335
335
                wt.commit('commit %d' % x)
345
345
        job.setup(self.db)
346
346
        bundle_data = factory.get_payload_json()
347
347
        # We use multiple commits to show that the latest revno is used.
348
 
        with temp_dir() as source_branch_dir:
 
348
        with bzr_isolation() as source_branch_dir:
349
349
            wt = BzrDir.create_standalone_workingtree(source_branch_dir)
350
350
            base = wt.commit('commit message')
351
351
            wt.commit('commit message', rev_id=bundle_data['commit'])