Merge "Kill HEADS file"

diff --cc neutron/db/migration/cli.py
Simple merge

diff --cc neutron/tests/unit/db/test_migration.py
index fc597c9e4d632bca3bcff26deb5e53d7ee375ba6,43da6067890ba9de4f049fada57ba7579185148e..a2129f567071cad678eefd9650cae892a1a68f6e
--- 1/neutron/tests/unit/db/test_migration.py
--- 2/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)