Merge pull request #1573 from zombie/1049189-e10s-fxteam

bug 1049189 - run e10s tests on trunk builds only, r=@Mossop
mozilla · Aug 6, 2014 · f9591df · f9591df
2 parents 7db4aad + 028633b
commit f9591df
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/test/addons/e10s-tabs/lib/main.js b/test/addons/e10s-tabs/lib/main.js
@@ -4,15 +4,15 @@
 'use strict';
 
 const { merge } = require('sdk/util/object');
-const { get } = require('sdk/preferences/service');
+const { version } = require('sdk/system');
 
 merge(module.exports, require('./test-tab'));
 merge(module.exports, require('./test-tab-events'));
 merge(module.exports, require('./test-tab-observer'));
 merge(module.exports, require('./test-tab-utils'));
 
-// e10s tests should not ride the train to aurora
-if (get('app.update.channel') !== 'nightly') {
+// run e10s tests only on builds from trunk, fx-team, Nightly..
+if (!version.endsWith('a1')) {
   module.exports = {};
 }
 

diff --git a/test/addons/e10s/lib/main.js b/test/addons/e10s/lib/main.js
@@ -6,6 +6,7 @@
 const { get: getPref } = require('sdk/preferences/service');
 const { getMostRecentBrowserWindow } = require('sdk/window/utils');
 const { openTab, closeTab, getBrowserForTab } = require('sdk/tabs/utils');
+const { version } = require('sdk/system');
 const tabs = require('sdk/tabs');
 
 exports.testRemotePrefIsSet = function(assert) {
@@ -28,8 +29,8 @@ exports.testTabIsRemote = function(assert, done) {
   mm.loadFrameScript('data:,sendAsyncMessage("7")', true);
 }
 
-// e10s tests should not ride the train to aurora, beta
-if (getPref('app.update.channel') !== 'nightly') {
+// run e10s tests only on builds from trunk, fx-team, Nightly..
+if (!version.endsWith('a1')) {
   module.exports = {};
 }