← Back to branch summary

~canonical-launchpad-branches/turnip/turnip

« back to all changes in this revision

Viewing changes to turnip/api/tests/test_api.py

  • Committer: Colin Watson
  • Date: 2015-09-07 16:19:38 UTC
  • mfrom: (181.1.2 merge-prerequisite)
  • Revision ID: cjwatson@canonical.com-20150907161938-ap0flof821uyjya7
[r=wgrant][bug=1489839] Add an optional sha1_prerequisite parameter to compare-merge API.

Show diffs side-by-side

added added

removed removed

Lines of Context:
turnip/api/tests/test_api.py
382
382
            """), resp.json_body['patch'])
383
383
        self.assertEqual(['blah.txt'], resp.json_body['conflicts'])
384
384
 
 
385
    def test_repo_diff_merge_with_prerequisite(self):
 
386
        """Ensure that compare-merge handles prerequisites."""
 
387
        repo = RepoFactory(self.repo_store)
 
388
        c1 = repo.add_commit('foo\n', 'blah.txt')
 
389
        c2 = repo.add_commit('foo\nbar\n', 'blah.txt', parents=[c1])
 
390
        c3 = repo.add_commit('foo\nbar\nbaz\n', 'blah.txt', parents=[c2])
 
391
 
 
392
        resp = self.app.get(
 
393
            '/repo/{}/compare-merge/{}:{}?sha1_prerequisite={}'.format(
 
394
                self.repo_path, c1, c3, c2))
 
395
        self.assertIn(dedent("""\
 
396
            @@ -1,2 +1,3 @@
 
397
             foo
 
398
             bar
 
399
            +baz
 
400
            """), resp.json_body['patch'])
 
401
        self.assertEqual([], resp.json_body['conflicts'])
 
402
 
385
403
    def test_repo_diff_merge_empty(self):
386
404
        """Ensure that diffing two identical commits returns an empty string
387
405
        as the patch, not None."""