Merge pull request nwjs#1125 from richardcypher/fix_crash_onreload

rogerwang · rogerwang · commit c350b0ced873 · 2013-10-22T19:50:26.000-07:00
[test]fix bug of crash on reload
diff --git a/tests/automatic_tests/crashonreload/index.html b/tests/automatic_tests/crashonreload/index.html
@@ -10,15 +10,12 @@
 var gui = require('nw.gui');
 var win = gui.Window.get();
 win.showDevTools('devtools');
-setTimeout(function() {
-  location.reload();
-}, 2000);
-setTimeout(function() {
-  var client = require('../../nw_test_app').createClient({
-    argv: gui.App.argv,
-    data: 'ok'
-  });  
-}, 3000);
+
+win.on('loaded',function(){
+  setTimeout(function() {
+    location.reload();
+  }, 1000);
+})
 </script>
 </body>
 </html>
diff --git a/tests/automatic_tests/crashonreload/mocha_test.js b/tests/automatic_tests/crashonreload/mocha_test.js
@@ -1,26 +1,23 @@
+var spawn = require('child_process').spawn;
+var path = require('path');
 var app_test = require('./nw_test_app');
 describe('crash on reload',function(){
   it('nw should not crash when reloading with devtool opened',function(done){
     this.timeout(0);
     var result = false;
-    var child = app_test.createChildProcess({
-        execPath: process.execPath,
-        appPath: path.join(global.tests_dir, 'crashonreload'),
-        end: function(data, app) {
+    var exec_argv = [path.join(global.tests_dir, 'crashonreload')];
+
+    var app = spawn(process.execPath, exec_argv);
+      app.on('exit', function (code){
+      if (code != 0) return done('nw crashes');
+        result = true;
+        done();
+      });
+    setTimeout(function(){
+        if (!result) {
           app.kill();
-          result = true;
-          if (data == 'ok') {
-            done();
-          }
-          else 
-            done('the nw crashes');
+          done();
         }
-    });
-    setTimeout(function() {
-      if (!result) {
-        child.close();
-        done('nw crashes when reloading with devtool opened');
-      }
-    }, 4000);
+    }, 7500);
   })
 })
