You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2016/03/21 22:19:32 UTC
ambari git commit: AMBARI-15482 - Restarting HDFS Before Upgrade
Finalizing Does Not Supply the rollingUpgrade Flag (part2) (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk 79b9e570f -> 3a42f6131
AMBARI-15482 - Restarting HDFS Before Upgrade Finalizing Does Not Supply the rollingUpgrade Flag (part2) (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3a42f613
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3a42f613
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3a42f613
Branch: refs/heads/trunk
Commit: 3a42f6131c37043f712215cbf5744b5b07167b6e
Parents: 79b9e57
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Mon Mar 21 17:18:38 2016 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Mon Mar 21 17:18:48 2016 -0400
----------------------------------------------------------------------
.../main/admin/stack_and_upgrade_controller_test.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a42f613/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
index 385a31f..4db9f2d 100644
--- a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
+++ b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
@@ -1483,7 +1483,7 @@ describe('App.MainAdminStackAndUpgradeController', function() {
describe("#suspendUpgrade()", function() {
beforeEach(function () {
- sinon.stub(controller, 'abortUpgrade').returns({
+ sinon.stub(controller, 'abortUpgradeWithSuspend').returns({
done: Em.clb
});
sinon.stub(controller, 'setDBProperty', Em.K);
@@ -1491,12 +1491,12 @@ describe('App.MainAdminStackAndUpgradeController', function() {
controller.suspendUpgrade();
});
afterEach(function () {
- controller.abortUpgrade.restore();
+ controller.abortUpgradeWithSuspend.restore();
controller.setDBProperty.restore();
App.clusterStatus.setClusterStatus.restore();
});
it("upgrade aborted", function() {
- expect(controller.abortUpgrade.calledOnce).to.be.true;
+ expect(controller.abortUpgradeWithSuspend.calledOnce).to.be.true;
});
it('App.upgradeState is ABORTED', function () {
expect(App.get('upgradeState')).to.equal('ABORTED');