/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_conflicts.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-06-11 12:46:45 UTC
  • mfrom: (7511.1.1 actions-no-fork)
  • Revision ID: breezy.the.bot@gmail.com-20200611124645-4lx66gps99i0hmzh
Avoid using fork when running the testsuite in github actions.

Merged from https://code.launchpad.net/~jelmer/brz/actions-no-fork/+merge/385565

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_conflicts.py
23
23
    option,
24
24
    osutils,
25
25
    tests,
26
 
    transform,
27
26
    )
28
27
from . import (
29
28
    script,
1077
1076
        # This is nearly like TestResolveNonDirectoryParent but with branch and
1078
1077
        # trunk switched. As such it should certainly produce the same
1079
1078
        # conflict.
1080
 
        self.assertRaises(transform.MalformedTransform,
 
1079
        self.assertRaises(errors.MalformedTransform,
1081
1080
                          self.run_script, """
1082
1081
$ brz init trunk
1083
1082
...