Merge pull request #2762 from blink1073/precise-test

Switch to Trusty on Travis

.travis.yml

@@ -1,8 +1,8 @@
 language: node_js
 node_js:
 - '5'
-dist: precise
-sudo: false
+dist: trusty
+sudo: required
 addons:
   firefox: latest
 cache:

packages/docmanager/src/savehandler.ts

@@ -190,7 +190,7 @@ class SaveHandler implements IDisposable {
       }
       let duration = new Date().getTime() - start;
       // New save interval: higher of 10x save duration or min interval.
-      this._interval = Math.max(10 * duration, this._minInterval);
+      this._interval = Math.max(this._multiplier * duration, this._minInterval);
       // Restart the update to pick up the new interval.
       this._setTimer();
     });
@@ -205,6 +205,7 @@ class SaveHandler implements IDisposable {
   private _isActive = false;
   private _inDialog = false;
   private _isDisposed = false;
+  private _multiplier = 10;
 }
 
 

test/karma-cov.conf.js

@@ -7,7 +7,7 @@ module.exports = function (config) {
     frameworks: ['mocha'],
     client: {
       mocha: {
-        timeout : 5000, // 5 seconds - upped from 2 seconds
+        timeout : 10000, // 10 seconds - upped from 2 seconds
         retries: 3 // Allow for slow server on CI.
       }
     },
@@ -28,6 +28,7 @@ module.exports = function (config) {
       json: 'coverage/remapped.json',
       html: 'coverage/html'
     },
+    browserNoActivityTimeout: 31000, // 31 seconds - upped from 10 seconds
     port: 9876,
     colors: true,
     singleRun: true,

test/karma.conf.js

@@ -5,7 +5,7 @@ module.exports = function (config) {
     reporters: ['mocha'],
     client: {
       mocha: {
-        timeout : 5000, // 5 seconds - upped from 2 seconds
+        timeout : 10000, // 10 seconds - upped from 2 seconds
         retries: 3 // Allow for slow server on CI.
       }
     },
@@ -17,6 +17,7 @@ module.exports = function (config) {
     preprocessors: {
       'build/bundle.js': ['sourcemap']
     },
+    browserNoActivityTimeout: 31000, // 31 seconds - upped from 10 seconds
     port: 9876,
     colors: true,
     singleRun: true,

test/src/docmanager/savehandler.spec.ts

@@ -41,7 +41,7 @@ describe('docregistry/savehandler', () => {
   });
 
   beforeEach(() => {
-    context = new Context({ manager, factory, path: uuid() });
+    context = new Context({ manager, factory, path: uuid() + '.txt' });
     handler = new SaveHandler({ context, manager });
   });
 
@@ -129,6 +129,8 @@ describe('docregistry/savehandler', () => {
 
       it('should continue to save', (done) => {
         let called = 0;
+        // Lower the duration multiplier.
+        (handler as any)._multiplier = 1;
         context.fileChanged.connect(() => {
           if (called === 0) {
             context.model.fromString('bar');
@@ -144,6 +146,8 @@ describe('docregistry/savehandler', () => {
       });
 
       it('should overwrite the file on disk', (done) => {
+        // Lower the duration multiplier.
+        (handler as any)._multiplier = 1;
         context.model.fromString('foo');
         context.save().then(() => {
           setTimeout(() => {
@@ -165,6 +169,8 @@ describe('docregistry/savehandler', () => {
       });
 
       it('should revert to the file on disk', (done) => {
+        // Lower the duration multiplier.
+        (handler as any)._multiplier = 1;
         context.model.fromString('foo');
         context.save().then(() => {
           context.fileChanged.connect(() => {
@@ -201,6 +207,7 @@ describe('docregistry/savehandler', () => {
         handler.start();
         expect(handler.isActive).to.be(true);
         handler.stop();
+        expect(handler.isActive).to.be(false);
       });
 
     });