from wizard import resolve def test_resolve_simple(): contents = """ foo bar <<<<<<< HEAD baz ======= boo >>>>>>> upstream bing """ spec = """ <<<<<<< baz ======= boo >>>>>>> """ result = [0] assert resolve.resolve(contents, spec, result) == """ foo bar boo bing """ def test_resolve_wildcard(): contents = """ foo bar <<<<<<< HEAD common uncommon still uncommon ======= transformed common >>>>>>> 456ef127bf8531bb363b1195172c71bce3747ae7 baz """ spec = """ <<<<<<< common ***1*** ======= transformed common >>>>>>> """ result = [0, 1] assert resolve.resolve(contents, spec, result) == """ foo bar transformed common uncommon still uncommon baz """ def test_resolve_user(): contents = """ top <<<<<<< the user is right ======= blah blah >>>>>>>""" spec = """ <<<<<<< ***1*** ======= blah blah >>>>>>> """ result = [-1] assert resolve.resolve(contents, spec, result) == """ top the user is right """