From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 21 Mar 2014 05:54:29 +0000 (+0000)
Subject: Merge "add HEAD sentinel file that contains migration revision"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c36f02d83e797ffb001269a69142473bfc7829a4;p=openstack-build%2Fneutron-build.git

Merge "add HEAD sentinel file that contains migration revision"
---

c36f02d83e797ffb001269a69142473bfc7829a4
diff --cc neutron/tests/unit/test_db_migration.py
index 83c2ede4f,be3265bea..9147a6701
--- a/neutron/tests/unit/test_db_migration.py
+++ b/neutron/tests/unit/test_db_migration.py
@@@ -40,7 -40,10 +40,9 @@@ class TestCli(base.BaseTestCase)
          super(TestCli, self).setUp()
          self.do_alembic_cmd_p = mock.patch.object(cli, 'do_alembic_command')
          self.do_alembic_cmd = self.do_alembic_cmd_p.start()
+         self.mock_alembic_err = mock.patch('alembic.util.err').start()
+         self.mock_alembic_err.side_effect = SystemExit
          self.addCleanup(self.do_alembic_cmd_p.stop)
 -        self.addCleanup(cli.CONF.reset)
  
      def _main_test_helper(self, argv, func_name, exp_args=(), exp_kwargs={}):
          with mock.patch.object(sys, 'argv', argv):