From 46513f6db563b8549f5811d0b2bc13a413ca4a67 Mon Sep 17 00:00:00 2001
From: Drew Folta <drew@folta.net>
Date: Thu, 29 Nov 2012 09:51:15 -0800
Subject: [PATCH] disable yaml tests, other cleanups

---
 tests/func/applications/apps.json             | 196 +++++++++---------
 .../common/commonclienttest_descriptor.json   |   0
 .../common/commonservertest_descriptor.json   |   0
 .../func/common/html5apptest_descriptor.json  |   0
 tests/func/config/configtest_descriptor.json  |   0
 .../developerguide_descriptor.json            |   0
 .../func/examples/input/input_descriptor.json |   0
 .../newsboxes/newsboxes_descriptor.json       |   0
 .../examples/simple/simple_descriptor.json    |   0
 .../func/routing/routingtest_descriptor.json  |   0
 .../usecases/usecasestest_descriptor.json     |   0
 ... yamlconfigtest_descrip-DISABLED-tor.json} |   7 +-
 tests/run.js                                  |  36 ++--
 13 files changed, 123 insertions(+), 116 deletions(-)
 mode change 100755 => 100644 tests/func/common/commonclienttest_descriptor.json
 mode change 100755 => 100644 tests/func/common/commonservertest_descriptor.json
 mode change 100755 => 100644 tests/func/common/html5apptest_descriptor.json
 mode change 100755 => 100644 tests/func/config/configtest_descriptor.json
 mode change 100755 => 100644 tests/func/examples/developerguide/developerguide_descriptor.json
 mode change 100755 => 100644 tests/func/examples/input/input_descriptor.json
 mode change 100755 => 100644 tests/func/examples/newsboxes/newsboxes_descriptor.json
 mode change 100755 => 100644 tests/func/examples/simple/simple_descriptor.json
 mode change 100755 => 100644 tests/func/routing/routingtest_descriptor.json
 mode change 100755 => 100644 tests/func/usecases/usecasestest_descriptor.json
 rename tests/func/yaml-config/{yamlconfigtest_descriptor.json => yamlconfigtest_descrip-DISABLED-tor.json} (90%)
 mode change 100755 => 100644

diff --git a/tests/func/applications/apps.json b/tests/func/applications/apps.json
index d2466f611..f7f0da267 100644
--- a/tests/func/applications/apps.json
+++ b/tests/func/applications/apps.json
@@ -3,346 +3,346 @@
 		{
 	        "name":"yaml-config",
 	        "path": "./frameworkapp/yaml-config",
-	        "enabled": "true",
+	        "enabled": false,   "//":"see trello mojito-perf card #204",
 	        "group": "qeapp"
 	    },
         {
             "name":"usecase",
             "path": "./frameworkapp/usecase",
-            "port": "4085",
-            "enabled": "true",
+            "port": 4085,
+            "enabled": true,
             "group": "qeapp"
         },
         {
             "name":"common",
             "path": "./frameworkapp/common",
-            "port": "4081",
-            "enabled": "true",
+            "port": 4081,
+            "enabled": true,
             "group": "qeapp"
         },
         {
             "name":"routing",
             "path": "./frameworkapp/routing",
-            "port": "4082",
-            "enabled": "true",
+            "port": 4082,
+            "enabled": true,
             "group": "qeapp"
         },
         {
             "name":"serveronly",
             "path": "./frameworkapp/serveronly",
-            "port": "4083",
-            "enabled": "true",
+            "port": 4083,
+            "enabled": true,
             "group": "qeapp"
         },
         {
             "name":"flatfile",
             "path": "./frameworkapp/flatfile",
-            "port": "4084",
-            "enabled": "true",
+            "port": 4084,
+            "enabled": true,
             "group": "qeapp",
             "type": "static"
         },
         {
             "name":"commandline",
             "path": "./frameworkapp/commandline",
-            "port": "4080",
-            "enabled": "false",
+            "port": 4080,
+            "enabled": false,
             "group": "qeapp"
         },
         {
             "name":"configapp",
             "path": "./frameworkapp/configapp",
-            "port": "null",
+            "port": null,
+            "enabled": true,
+            "group": "qeapp",
             "tests": [
                 {
-                    "port": "5000",
+                    "port": 5000,
                     "param": ""
                 },
                 {
-                    "port": "5001",
+                    "port": 5001,
                     "param": "environment:production"
                 },
                 {
-                    "port": "5002",
+                    "port": 5002,
                     "param": "environment:testing"
                 },
                 {
-                    "port": "5003",
+                    "port": 5003,
                     "param": "environment:testing,subject:math"
                 },
                 {
-                    "port": "5004",
+                    "port": 5004,
                     "param": "environment:testing,subject:bc-100"
                 },
                 {
-                    "port": "5005",
+                    "port": 5005,
                     "param": "environment:testing,lang:de,subject:math"
                 },
                 {
-                    "port": "5006",
+                    "port": 5006,
                     "param": "environment:testing,lang:fr"
                 }
-            ],
-            "enabled": "true",
-            "group": "qeapp"
+            ]
         },
         {
             "name":"hello",
             "path": "../../../examples/developer-guide/hello",
-            "port": "4086",
-            "enabled": "true",
+            "port": 4086,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"simple_view",
             "path": "../../../examples/developer-guide/simple_view",
-            "port": "4087",
-            "enabled": "true",
+            "port": 4087,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"htmlframe_mojit",
             "path": "../../../examples/developer-guide/htmlframe_mojit",
-            "port": "4089",
-            "enabled": "true",
+            "port": 4089,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"scroll_views",
             "path": "../../../examples/developer-guide/scroll_views",
-            "port": "4090",
-            "enabled": "true",
+            "port": 4090,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"simple_assets",
             "path": "../../../examples/developer-guide/simple_assets",
-            "port": "4091",
-            "enabled": "true",
+            "port": 4091,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"framed_assets",
             "path": "../../../examples/developer-guide/framed_assets",
-            "port": "4092",
-            "enabled": "true",
+            "port": 4092,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"device_assets",
             "path": "../../../examples/developer-guide/device_assets",
-            "port": "4093",
-            "enabled": "true",
+            "port": 4093,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"model_yql",
             "path": "../../../examples/developer-guide/model_yql",
-            "port": "4094",
-            "enabled": "true",
+            "port": 4094,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"inter-mojit",
             "path": "../../../examples/developer-guide/inter-mojit",
-            "port": "4095",
-            "enabled": "true",
+            "port": 4095,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"multiple_mojits",
             "path": "../../../examples/developer-guide/multiple_mojits",
-            "port": "4096",
-            "enabled": "true",
+            "port": 4096,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"simple_config",
             "path": "../../../examples/developer-guide/simple_config",
-            "port": "4097",
-            "enabled": "true",
+            "port": 4097,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"configure_routing",
             "path": "../../../examples/developer-guide/configure_routing",
-            "port": "4098",
-            "enabled": "true",
+            "port": 4098,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"using_parameters",
             "path": "../../../examples/developer-guide/using_parameters",
-            "port": "4100",
-            "enabled": "true",
+            "port": 4100,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"locale_i18n",
             "path": "../../../examples/developer-guide/locale_i18n",
-            "port": "4101",
-            "enabled": "true",
+            "port": 4101,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"generating_urls",
             "path": "../../../examples/developer-guide/generating_urls",
-            "port": "4102",
-            "enabled": "true",
+            "port": 4102,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"binding_events",
             "path": "../../../examples/developer-guide/binding_events",
-            "port": "4103",
-            "enabled": "true",
+            "port": 4103,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"part1",
             "path": "../../../examples/simple/part1",
-            "port": "4104",
-            "enabled": "true",
+            "port": 4104,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"part2",
             "path": "../../../examples/simple/part2",
-            "port": "4105",
-            "enabled": "true",
+            "port": 4105,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"part3",
             "path": "../../../examples/simple/part3",
-            "port": "4106",
-            "enabled": "true",
+            "port": 4106,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"part4",
             "path": "../../../examples/simple/part4",
-            "port": "4107",
-            "enabled": "true",
+            "port": 4107,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"part5",
             "path": "../../../examples/simple/part5",
-            "port": "4108",
-            "enabled": "true",
+            "port": 4108,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"part7",
             "path": "../../../examples/simple/part7",
-            "port": "4109",
-            "enabled": "true",
+            "port": 4109,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"part8",
             "path": "../../../examples/simple/part8",
-            "port": "4110",
-            "enabled": "true",
+            "port": 4110,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"get",
             "path": "../../../examples/input/get",
-            "port": "4111",
-            "enabled": "true",
+            "port": 4111,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"merged",
             "path": "../../../examples/input/merged",
-            "port": "4112",
-            "enabled": "true",
+            "port": 4112,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"post",
             "path": "../../../examples/input/post",
-            "port": "4113",
-            "enabled": "true",
+            "port": 4113,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"route",
             "path": "../../../examples/input/route",
-            "port": "4114",
-            "enabled": "true",
+            "port": 4114,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"part6",
             "path": "../../../examples/simple/part6",
-            "port": "4115",
-            "enabled": "true",
+            "port": 4115,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"device_views",
             "path": "../../../examples/developer-guide/device_views",
-            "port": "4117",
-            "enabled": "true",
+            "port": 4117,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"framed_config",
             "path": "../../../examples/developer-guide/framed_config",
-            "port": "4118",
-            "enabled": "true",
+            "port": 4118,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"yui_module",
             "path": "../../../examples/developer-guide/yui_module",
-            "port": "4119",
-            "enabled": "true",
+            "port": 4119,
+            "enabled": true,
             "group": "example"
         },
         {
             "name":"simple_logging",
             "path": "../../../examples/developer-guide/simple_logging",
-            "port": "4120",
-            "enabled": "true",
+            "port": 4120,
+            "enabled": true,
             "group": "example"
         },
 		{
             "name":"adding_view_engines",
             "path": "../../../examples/developer-guide/adding_view_engines",
-            "port": "4121",
-            "enabled": "true",
+            "port": 4121,
+            "enabled": true,
             "group": "example"
         },
 		{
             "name":"global_assets",
             "path": "../../../examples/developer-guide/global_assets",
-            "port": "4122",
-            "enabled": "true",
+            "port": 4122,
+            "enabled": true,
             "group": "example"
         },
 		{
             "name":"unittest_model_controller",
             "path": "../../../examples/developer-guide/unittest_model_controller",
-            "port": "4123",
-            "enabled": "true",
+            "port": 4123,
+            "enabled": true,
             "group": "example"
         },
 		{
             "name":"using_configs",
             "path": "../../../examples/developer-guide/using_configs",
-            "port": "4124",
-            "enabled": "true",
+            "port": 4124,
+            "enabled": true,
             "group": "example"
         },
 		{
             "name":"newsboxes",
             "path": "../../../examples/newsboxes",
-            "port": "4125",
-            "enabled": "true",
+            "port": 4125,
+            "enabled": true,
             "group": "example"
         }
     ]
diff --git a/tests/func/common/commonclienttest_descriptor.json b/tests/func/common/commonclienttest_descriptor.json
old mode 100755
new mode 100644
diff --git a/tests/func/common/commonservertest_descriptor.json b/tests/func/common/commonservertest_descriptor.json
old mode 100755
new mode 100644
diff --git a/tests/func/common/html5apptest_descriptor.json b/tests/func/common/html5apptest_descriptor.json
old mode 100755
new mode 100644
diff --git a/tests/func/config/configtest_descriptor.json b/tests/func/config/configtest_descriptor.json
old mode 100755
new mode 100644
diff --git a/tests/func/examples/developerguide/developerguide_descriptor.json b/tests/func/examples/developerguide/developerguide_descriptor.json
old mode 100755
new mode 100644
diff --git a/tests/func/examples/input/input_descriptor.json b/tests/func/examples/input/input_descriptor.json
old mode 100755
new mode 100644
diff --git a/tests/func/examples/newsboxes/newsboxes_descriptor.json b/tests/func/examples/newsboxes/newsboxes_descriptor.json
old mode 100755
new mode 100644
diff --git a/tests/func/examples/simple/simple_descriptor.json b/tests/func/examples/simple/simple_descriptor.json
old mode 100755
new mode 100644
diff --git a/tests/func/routing/routingtest_descriptor.json b/tests/func/routing/routingtest_descriptor.json
old mode 100755
new mode 100644
diff --git a/tests/func/usecases/usecasestest_descriptor.json b/tests/func/usecases/usecasestest_descriptor.json
old mode 100755
new mode 100644
diff --git a/tests/func/yaml-config/yamlconfigtest_descriptor.json b/tests/func/yaml-config/yamlconfigtest_descrip-DISABLED-tor.json
old mode 100755
new mode 100644
similarity index 90%
rename from tests/func/yaml-config/yamlconfigtest_descriptor.json
rename to tests/func/yaml-config/yamlconfigtest_descrip-DISABLED-tor.json
index d66a233aa..8896a2b12
--- a/tests/func/yaml-config/yamlconfigtest_descriptor.json
+++ b/tests/func/yaml-config/yamlconfigtest_descrip-DISABLED-tor.json
@@ -1,3 +1,6 @@
+
+see trello mojito-perf card #204
+
 [
     {
         "settings": [ "master" ],
@@ -8,7 +11,7 @@
             "baseUrl" : "http://localhost:4000"
         },
 
-        "dataprovider" : {     
+        "dataprovider" : {
            "yamlconfig1" : {
                 "group" : "smoke,yaml",
                 "params" : {
@@ -23,7 +26,7 @@
                      "page" : "$$config.baseUrl$$/spec"
                 }
             }
-        }     
+        }
     },
 
     {
diff --git a/tests/run.js b/tests/run.js
index a99fc6297..299c558d4 100755
--- a/tests/run.js
+++ b/tests/run.js
@@ -177,24 +177,23 @@ function deploy (cmd, callback) {
 
     for (var i=0; i<apps.length; i++) {
         (function (app) {
-            var port = app.port ? parseInt(app.port, 10) : null,
+            var port = app.port || null,
                 type = app.type || 'mojito';
-                
+
             if ('mojito' === type) {
                 if (app.tests) {
                     var mytests = app.tests;
                     for(var j=0; j<mytests.length; j++) {
-                        (function () {
-                            var test = mytests[j],
-                                port = test.port ? parseInt(test.port) : null;
+                        (function (test) {
+                            var port = test.port || app.port || null;
                             appSeries.push(function (callback) {
-                                runMojitoApp(cmd, cmd.funcPath + '/applications', app.path, port, test.param, callback);
+                                runMojitoApp(app, cmd, cmd.funcPath + '/applications', port, test.param, callback);
                             });
-                        })();
+                        })(mytests[j]);
                     }
-                } else if (app.enabled === "true" && app.path) {
+                } else {
                     appSeries.push(function (callback) {
-                        runMojitoApp(cmd, cmd.funcPath + '/applications', app.path, port, app.param, callback);
+                        runMojitoApp(app, cmd, cmd.funcPath + '/applications', port, app.param, callback);
                     });
                 }
             } else if ('static' === type) {
@@ -310,19 +309,24 @@ function runCommand (path, command, argv, callback) {
     return cmd;
 }
 
-function runMojitoApp (cliOptions, basePath, path, port, params, callback) {
+function runMojitoApp (app, cliOptions, basePath, port, params, callback) {
+    if (!app.enabled) {
+        console.error('------------------------------- DISABLED APP ' + app.name + ':' + port);
+        callback();
+        return;
+    }
     /* useful when debugging
     var OK = {
         4081: true,
     };
     if (! OK[port]) {
-        console.error('------------------------------- SKIPPING APP ON PORT ' + port);
+        console.error('------------------------------- SKIPPING APP ' + app.name);
         callback();
         return;
     }
     */
     params = params || '';
-    console.log('Starting ' + path + ' at port ' + port + ' with params ' + (params || 'empty'));
+    console.log('Starting ' + app.name + ' at port ' + port + ' with params ' + (params || 'empty'));
     var cmdArgs = ['start'];
     if (port) {
         cmdArgs.push(port);
@@ -330,11 +334,11 @@ function runMojitoApp (cliOptions, basePath, path, port, params, callback) {
     if (params) {
         cmdArgs.push('--context');
         cmdArgs.push(params);
-    } 
-    var p = runCommand(basePath + '/' + path, cwd + "/../bin/mojito", cmdArgs, function () {});
-    
+    }
+    var p = runCommand(basePath + '/' + app.path, cwd + "/../bin/mojito", cmdArgs, function () {});
+
     pids.push(p.pid);
-    pidNames[p.pid] = libpath.basename(path) + ':' + port + (params ? '?' + params : '');
+    pidNames[p.pid] = app.name + ':' + port + (params ? '?' + params : '');
     if (cliOptions.debugApps) {
         p.stdout.on('data', function(data) {
             console.error('---DEBUG ' + port + ' STDOUT--- ' + data.toString());