From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 28 Sep 2015 15:20:10 +0000 (+0000)
Subject: Merge "Kill HEADS file"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=820a43d152a82d3d1db80c407bd692f3ebf9beaa;p=openstack-build%2Fneutron-build.git

Merge "Kill HEADS file"
---

820a43d152a82d3d1db80c407bd692f3ebf9beaa
diff --cc neutron/tests/unit/db/test_migration.py
index fc597c9e4,43da60678..a2129f567
--- a/neutron/tests/unit/db/test_migration.py
+++ b/neutron/tests/unit/db/test_migration.py
@@@ -168,41 -170,14 +170,41 @@@ class TestCli(base.BaseTestCase)
              [{'revision': 'foo', 'sql': True}]
          )
  
 +    def test_branches(self):
 +        self._main_test_helper(
 +            ['prog', 'branches'],
 +            'branches',
 +            [{'verbose': False}])
 +
 +        self._main_test_helper(
 +            ['prog', 'branches', '--verbose'],
 +            'branches',
 +            [{'verbose': True}])
 +
      def test_current(self):
 -        self._main_test_helper(['prog', 'current'], 'current')
 +        self._main_test_helper(
 +            ['prog', 'current'],
 +            'current',
 +            [{'verbose': False}])
 +
 +        self._main_test_helper(
 +            ['prog', 'current', '--verbose'],
 +            'current',
 +            [{'verbose': True}])
  
      def test_history(self):
 -        self._main_test_helper(['prog', 'history'], 'history')
 +        self._main_test_helper(
 +            ['prog', 'history'],
 +            'history',
 +            [{'verbose': False}])
 +
 +        self._main_test_helper(
 +            ['prog', 'history', '--verbose'],
 +            'history',
 +            [{'verbose': True}])
  
      def test_check_migration(self):
-         with mock.patch.object(cli, 'validate_heads_file') as validate:
+         with mock.patch.object(cli, 'validate_head_file') as validate:
              self._main_test_helper(['prog', 'check_migration'], 'branches')
              self.assertEqual(len(self.projects), validate.call_count)