You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by jh...@apache.org on 2017/02/07 04:25:46 UTC
[02/23] hadoop git commit: YARN-5866. Fix few issues reported by
jshint in new YARN UI. Contributed by Akhil P B.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
index 1c5b7b3..766c5c7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
@@ -49,7 +49,7 @@ export default DS.JSONAPISerializer.extend({
relationshipUserData.push({
type: "YarnUser",
id: u.username + "_" + payload.queueName,
- })
+ });
});
}
@@ -85,12 +85,12 @@ export default DS.JSONAPISerializer.extend({
return {
queue: this._super(store, primaryModelClass, fixedPayload, id, requestType),
includedData: includedData
- }
+ };
},
handleQueue(store, primaryModelClass, payload, id, requestType) {
var data = [];
- var includedData = []
+ var includedData = [];
var result = this.normalizeSingleResponse(store, primaryModelClass,
payload, id, requestType);
@@ -112,8 +112,8 @@ export default DS.JSONAPISerializer.extend({
return {
data: data,
- includedData, includedData
- }
+ includedData: includedData
+ };
},
normalizeArrayResponse(store, primaryModelClass, payload, id,
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
index 6feab36..ad50621 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-import Ember from 'ember';
import DS from 'ember-data';
import Converter from 'yarn-ui/utils/converter';
@@ -48,16 +47,14 @@ export default DS.JSONAPISerializer.extend({
return fixedPayload;
},
- normalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeSingleResponse(store, primaryModelClass, payload, id/*, requestType*/) {
// payload is of the form {"nodeInfo":{}}
var p = this.internalNormalizeSingleResponse(store,
primaryModelClass, payload, id);
return { data: p };
},
- normalizeArrayResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
// expected response is of the form { data: [ {}, {} ] }
var normalizedArrayResponse = {};
if (payload.nodes) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
index b96ec16..6c0cfee 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
@@ -16,8 +16,6 @@
* limitations under the License.
*/
-import Constants from 'yarn-ui/constants';
-
export default {
preDefinedColors : ["#1f77b4", "#aec7e8", "#ffbb78",
"#98df8a", "#ff9896", "#9467bd", "#c5b0d5", "#8c564b",
@@ -43,14 +41,14 @@ export default {
startIdx = Math.max(nColors - colorsTarget.length, 0);
}
- for (var i = 0; i < colorsTarget.length; i++) {
+ for (i = 0; i < colorsTarget.length; i++) {
if (i + startIdx < nColors) {
colors[i + startIdx] = this.getColorByTarget(colorsTarget[i]);
}
}
var idx = 0;
- for (var i = 0; i < nColors; i++) {
+ for (i = 0; i < nColors; i++) {
if (!colors[i]) {
colors[i] = this.preDefinedColors[i % this.preDefinedColors.length];
idx ++;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
index fb6b61c..448dd18 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
@@ -110,7 +110,7 @@ export default {
}
},
memoryToSimpliedUnit: function(mb) {
- var unit = "MB"
+ var unit = "MB";
var value = mb;
if (value / 1024 >= 0.9) {
value = value / 1024;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/href-address-utils.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/href-address-utils.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/href-address-utils.js
index fd940a2..e36de4b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/href-address-utils.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/href-address-utils.js
@@ -16,8 +16,6 @@
* limitations under the License.
*/
-import Constants from 'yarn-ui/constants';
-
export default {
getApplicationLink: function(applicationId) {
return "#/yarn-app/" + applicationId;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/mock.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/mock.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/mock.js
index 62eebc1..3112acc 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/mock.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/mock.js
@@ -32,5 +32,5 @@ export default {
}
ref.set("model", data);
- },
-}
\ No newline at end of file
+ }
+};
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/sorter.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/sorter.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/sorter.js
index febef6f..c986798 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/sorter.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/sorter.js
@@ -51,19 +51,19 @@ export default {
*/
function naturalSort(a, b) {
var diff = a.length - b.length;
- if (diff != 0) {
+ if (diff !== 0) {
var splitA = a.split("_");
var splitB = b.split("_");
- if (splitA.length != splitB.length) {
+ if (splitA.length !== splitB.length) {
return a.localeCompare(b);
}
for (var i = 1; i < splitA.length; i++) {
var splitdiff = splitA[i].length - splitB[i].length;
- if (splitdiff != 0) {
+ if (splitdiff !== 0) {
return splitdiff;
}
var splitCompare = splitA[i].localeCompare(splitB[i]);
- if (splitCompare != 0) {
+ if (splitCompare !== 0) {
return splitCompare;
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
index 7736c75..b75a2e9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
@@ -22,7 +22,7 @@ var EmberApp = require('ember-cli/lib/broccoli/ember-app');
module.exports = function(defaults) {
var app = new EmberApp(defaults, {
- hinting: false
+ hinting: true
});
app.import("bower_components/datatables/media/css/jquery.dataTables.min.css");
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-container-log-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-container-log-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-container-log-test.js
index 45808a5..93cdec6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-container-log-test.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-container-log-test.js
@@ -17,6 +17,7 @@
*/
import { moduleForModel, test } from 'ember-qunit';
+import Ember from 'ember';
moduleForModel('yarn-container-log', 'Unit | Model | ContainerLog', {
// Specify the other units that are required for this test.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-app-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-app-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-app-test.js
index 7e2e62f..3b91ea7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-app-test.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-app-test.js
@@ -17,6 +17,7 @@
*/
import { moduleForModel, test } from 'ember-qunit';
+import Ember from 'ember';
moduleForModel('yarn-node-app', 'Unit | Model | NodeApp', {
// Specify the other units that are required for this test.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-container-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-container-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-container-test.js
index 88bf233..24ad4c4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-container-test.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-container-test.js
@@ -17,6 +17,7 @@
*/
import { moduleForModel, test } from 'ember-qunit';
+import Ember from 'ember';
moduleForModel('yarn-node-container', 'Unit | Model | NodeContainer', {
// Specify the other units that are required for this test.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-test.js
index 5877589..8d7c831 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-test.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-test.js
@@ -17,6 +17,7 @@
*/
import { moduleForModel, test } from 'ember-qunit';
+import Ember from 'ember';
moduleForModel('yarn-node', 'Unit | Model | Node', {
// Specify the other units that are required for this test.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-rm-node-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-rm-node-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-rm-node-test.js
index 4fd2517..2499ebc 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-rm-node-test.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-rm-node-test.js
@@ -17,6 +17,7 @@
*/
import { moduleForModel, test } from 'ember-qunit';
+import Ember from 'ember';
moduleForModel('yarn-rm-node', 'Unit | Model | RMNode', {
// Specify the other units that are required for this test.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-container-log-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-container-log-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-container-log-test.js
index 4e68da0..d0a78dd 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-container-log-test.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-container-log-test.js
@@ -17,7 +17,7 @@
*/
import { moduleFor, test } from 'ember-qunit';
-import Constants from 'yarn-ui/constants';
+import Ember from 'ember';
moduleFor('route:yarn-container-log', 'Unit | Route | ContainerLog', {
});
@@ -34,11 +34,11 @@ test('Test getting container log', function(assert) {
containerID: "container_e32_1456000363780_0002_01_000001",
logFileName: "syslog"};
var store = {
- findRecord: function(type) {
+ findRecord: function() {
return new Ember.RSVP.Promise(function(resolve) {
resolve(response);
- }
- )}
+ });
+ }
};
assert.expect(6);
var route = this.subject();
@@ -67,11 +67,11 @@ test('Test non HTTP error while getting container log', function(assert) {
containerID: "container_e32_1456000363780_0002_01_000001",
logFileName: "syslog"};
var store = {
- findRecord: function(type) {
+ findRecord: function() {
return new Ember.RSVP.Promise(function(resolve, reject) {
reject(error);
- }
- )}
+ });
+ }
};
assert.expect(6);
var route = this.subject();
@@ -92,16 +92,12 @@ test('Test non HTTP error while getting container log', function(assert) {
test('Test HTTP error while getting container log', function(assert) {
var error = {errors: [{status: 404, responseText: 'Not Found'}]};
- var response = {
- logs: "",
- containerID: "container_e32_1456000363780_0002_01_000001",
- logFileName: "syslog"};
var store = {
- findRecord: function(type) {
+ findRecord: function() {
return new Ember.RSVP.Promise(function(resolve, reject) {
reject(error);
- }
- )}
+ });
+ }
};
assert.expect(5);
var route = this.subject();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-app-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-app-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-app-test.js
index 8e5acf9..a4f787e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-app-test.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-app-test.js
@@ -17,6 +17,7 @@
*/
import { moduleFor, test } from 'ember-qunit';
+import Ember from 'ember';
moduleFor('route:yarn-node-app', 'Unit | Route | NodeApp', {
});
@@ -31,7 +32,7 @@ test('Test getting specific app on a node', function(assert) {
var response =
{id:"application_1456251210105_0001", state:"FINISHED", user:"root"};
var store = {
- queryRecord: function(type, query) {
+ queryRecord: function() {
return new Ember.RSVP.Promise(function(resolve) {
resolve(response);
});
@@ -40,17 +41,16 @@ test('Test getting specific app on a node', function(assert) {
assert.expect(6);
var route = this.subject();
route.set('store', store);
- var model =
- route.model({node_id:"localhost:64318", node_addr:"localhost:8042",
- app_id:"application_1456251210105_0001"}).
- then(
- function(value){
- assert.ok(value);
- assert.ok(value.nodeApp);
- assert.deepEqual(value.nodeApp, response);
- assert.ok(value.nodeInfo);
- assert.equal(value.nodeInfo.addr, 'localhost:8042');
- assert.equal(value.nodeInfo.id, 'localhost:64318');
- }
- );
+ route.model({node_id:"localhost:64318", node_addr:"localhost:8042",
+ app_id:"application_1456251210105_0001"})
+ .then(
+ function(value){
+ assert.ok(value);
+ assert.ok(value.nodeApp);
+ assert.deepEqual(value.nodeApp, response);
+ assert.ok(value.nodeInfo);
+ assert.equal(value.nodeInfo.addr, 'localhost:8042');
+ assert.equal(value.nodeInfo.id, 'localhost:64318');
+ }
+ );
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-apps-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-apps-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-apps-test.js
index 44d9995..8666ca5 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-apps-test.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-apps-test.js
@@ -17,6 +17,7 @@
*/
import { moduleFor, test } from 'ember-qunit';
+import Ember from 'ember';
moduleFor('route:yarn-node-apps', 'Unit | Route | NodeApps', {
});
@@ -34,7 +35,7 @@ test('Test getting apps on a node', function(assert) {
containerids:["container_e38_1456251210105_0002_01_000001",
"container_e38_1456251210105_0002_01_000002"]}];
var store = {
- query: function(type, query) {
+ query: function() {
return new Ember.RSVP.Promise(function(resolve) {
resolve(response.slice());
});
@@ -43,18 +44,17 @@ test('Test getting apps on a node', function(assert) {
assert.expect(8);
var route = this.subject();
route.set('store', store);
- var model =
- route.model({node_id:"localhost:64318", node_addr:"localhost:8042"}).
- then(
- function(value){
- assert.ok(value);
- assert.ok(value.apps);
- assert.equal(value.apps.length, 2);
- assert.deepEqual(response[0], value.apps[0]);
- assert.deepEqual(response[1], value.apps[1]);
- assert.ok(value.nodeInfo);
- assert.equal(value.nodeInfo.addr, 'localhost:8042');
- assert.equal(value.nodeInfo.id, 'localhost:64318');
- }
- );
+ route.model({node_id:"localhost:64318", node_addr:"localhost:8042"})
+ .then(
+ function(value){
+ assert.ok(value);
+ assert.ok(value.apps);
+ assert.equal(value.apps.length, 2);
+ assert.deepEqual(response[0], value.apps[0]);
+ assert.deepEqual(response[1], value.apps[1]);
+ assert.ok(value.nodeInfo);
+ assert.equal(value.nodeInfo.addr, 'localhost:8042');
+ assert.equal(value.nodeInfo.id, 'localhost:64318');
+ }
+ );
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-container-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-container-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-container-test.js
index f0b68fc..f304d42 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-container-test.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-container-test.js
@@ -17,6 +17,7 @@
*/
import { moduleFor, test } from 'ember-qunit';
+import Ember from 'ember';
moduleFor('route:yarn-node-container', 'Unit | Route | NodeContainer', {
});
@@ -36,7 +37,7 @@ test('Test getting specific container on a node', function(assert) {
nodeId: "localhost:64318", containerLogFiles:["syslog","stderr",
"stdout"]};
var store = {
- queryRecord: function(type, query) {
+ queryRecord: function() {
return new Ember.RSVP.Promise(function(resolve) {
resolve(response);
});
@@ -45,17 +46,16 @@ test('Test getting specific container on a node', function(assert) {
assert.expect(6);
var route = this.subject();
route.set('store', store);
- var model =
- route.model({node_id:"localhost:64318", node_addr:"localhost:8042",
- container_id:"container_e32_1456000363780_0002_01_000001"}).
- then(
- function(value){
- assert.ok(value);
- assert.ok(value.nodeContainer);
- assert.deepEqual(value.nodeContainer, response);
- assert.ok(value.nodeInfo);
- assert.equal(value.nodeInfo.addr, 'localhost:8042');
- assert.equal(value.nodeInfo.id, 'localhost:64318');
- }
- );
+ route.model({node_id:"localhost:64318", node_addr:"localhost:8042",
+ container_id:"container_e32_1456000363780_0002_01_000001"})
+ .then(
+ function(value){
+ assert.ok(value);
+ assert.ok(value.nodeContainer);
+ assert.deepEqual(value.nodeContainer, response);
+ assert.ok(value.nodeInfo);
+ assert.equal(value.nodeInfo.addr, 'localhost:8042');
+ assert.equal(value.nodeInfo.id, 'localhost:64318');
+ }
+ );
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-containers-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-containers-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-containers-test.js
index 8359713..5c25ca2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-containers-test.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-containers-test.js
@@ -17,6 +17,7 @@
*/
import { moduleFor, test } from 'ember-qunit';
+import Ember from 'ember';
moduleFor('route:yarn-node-containers', 'Unit | Route | NodeContainers', {
});
@@ -42,7 +43,7 @@ test('Test getting apps on a node', function(assert) {
nodeId:"localhost:64318",containerLogFiles:["syslog","stderr",
"syslog.shuffle","stdout"]}];
var store = {
- query: function(type, query) {
+ query: function() {
return new Ember.RSVP.Promise(function(resolve) {
resolve(response.slice());
});
@@ -51,18 +52,17 @@ test('Test getting apps on a node', function(assert) {
assert.expect(8);
var route = this.subject();
route.set('store', store);
- var model =
- route.model({node_id:"localhost:64318", node_addr:"localhost:8042"}).
- then(
- function(value){
- assert.ok(value);
- assert.ok(value.containers);
- assert.equal(value.containers.length, 2);
- assert.deepEqual(value.containers[0], response[0]);
- assert.deepEqual(value.containers[1], response[1]);
- assert.ok(value.nodeInfo);
- assert.equal(value.nodeInfo.addr, 'localhost:8042');
- assert.equal(value.nodeInfo.id, 'localhost:64318');
- }
- );
+ route.model({node_id:"localhost:64318", node_addr:"localhost:8042"})
+ .then(
+ function(value){
+ assert.ok(value);
+ assert.ok(value.containers);
+ assert.equal(value.containers.length, 2);
+ assert.deepEqual(value.containers[0], response[0]);
+ assert.deepEqual(value.containers[1], response[1]);
+ assert.ok(value.nodeInfo);
+ assert.equal(value.nodeInfo.addr, 'localhost:8042');
+ assert.equal(value.nodeInfo.id, 'localhost:64318');
+ }
+ );
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-test.js
index 4e82f1b..d0b0553 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-test.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-test.js
@@ -61,11 +61,11 @@ test('Test getting a node', function(assert) {
// Create store which returns appropriate responses.
var store = {
findRecord: function(type) {
- if (type == 'yarnNode') {
+ if (type === 'yarnNode') {
return new Ember.RSVP.Promise(function(resolve) {
resolve(nodeResponse);
});
- } else if (type == 'yarnRmNode') {
+ } else if (type === 'yarnRmNode') {
return new Ember.RSVP.Promise(function(resolve) {
resolve(rmNodeResponse);
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-nodes-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-nodes-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-nodes-test.js
index baa5bd6..8a1ce59 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-nodes-test.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-nodes-test.js
@@ -57,7 +57,7 @@ test('Test getting nodes', function(assert) {
containersCPUUsage: 0
}}];
var store = {
- findAll: function(type) {
+ findAll: function() {
return new Ember.RSVP.Promise(function(resolve) {
resolve(response);
});
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org