Remove Travis references

This commit is contained in:
John Kleinschmidt 2017-11-30 15:39:32 -05:00
parent aab35073ee
commit 0ef8f58090
9 changed files with 8 additions and 78 deletions

1
.gitignore vendored
View file

@ -42,6 +42,7 @@
/vendor/llvm-build/ /vendor/llvm-build/
/vendor/llvm/ /vendor/llvm/
/vendor/node/deps/node-inspect/.npmrc /vendor/node/deps/node-inspect/.npmrc
/vendor/node/deps/npm/test/fixtures/config/.npmrc
/vendor/npm/ /vendor/npm/
/vendor/python_26/ /vendor/python_26/
node_modules/ node_modules/

View file

@ -1,7 +1,9 @@
[![Electron Logo](https://electronjs.org/images/electron-logo.svg)](https://electronjs.org) [![Electron Logo](https://electronjs.org/images/electron-logo.svg)](https://electronjs.org)
[![Travis Build Status](https://travis-ci.org/electron/electron.svg?branch=master)](https://travis-ci.org/electron/electron)
[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/bc56v83355fi3369/branch/master?svg=true)](https://ci.appveyor.com/project/electron-bot/electron/branch/master) [![CircleCI Build Status](https://circleci.com/gh/electron/electron/tree/master.svg?style=shield)](https://circleci.com/gh/electron/electron/tree/master)
[![AppVeyor Build Status](https://windows-ci.electronjs.org/api/projects/status/nilyf07hcef14dvj/branch/master?svg=true)](https://windows-ci.electronjs.org/project/AppVeyor/electron/branch/master)
[![Jenkins Build Status](https://mac-ci.electronjs.org/buildStatus/icon?job=Electron%20org/electron/master)](https://mac-ci.electronjs.org/blue/organizations/jenkins/Electron%20org%2Felectron/activity?branch=master)
[![devDependency Status](https://david-dm.org/electron/electron/dev-status.svg)](https://david-dm.org/electron/electron?type=dev) [![devDependency Status](https://david-dm.org/electron/electron/dev-status.svg)](https://david-dm.org/electron/electron?type=dev)
[![Join the Electron Community on Slack](https://atom-slack.herokuapp.com/badge.svg)](https://atom-slack.herokuapp.com/) [![Join the Electron Community on Slack](https://atom-slack.herokuapp.com/badge.svg)](https://atom-slack.herokuapp.com/)

View file

@ -57,19 +57,6 @@ def main():
if os.environ.has_key('TARGET_ARCH'): if os.environ.has_key('TARGET_ARCH'):
target_arch = os.environ['TARGET_ARCH'] target_arch = os.environ['TARGET_ARCH']
is_travis = (os.getenv('TRAVIS') == 'true')
if is_travis and PLATFORM == 'linux':
print 'Setup travis CI'
execute(['sudo', 'apt-get', 'update'])
deps = LINUX_DEPS
if target_arch == 'arm':
deps += LINUX_DEPS_ARM
elif target_arch == 'arm64':
deps += LINUX_DEPS_ARM64
else:
deps += LINUX_DEPS_NO_ARM
execute(['sudo', 'apt-get', 'install'] + deps)
if PLATFORM == 'linux' and target_arch == 'x64': if PLATFORM == 'linux' and target_arch == 'x64':
os.environ['DISPLAY'] = ':99.0' os.environ['DISPLAY'] = ':99.0'
execute(['sh', '-e', '/etc/init.d/xvfb', 'start']) execute(['sh', '-e', '/etc/init.d/xvfb', 'start'])

View file

@ -55,7 +55,6 @@ describe('crashReporter module', () => {
it('should send minidump when renderer crashes', function (done) { it('should send minidump when renderer crashes', function (done) {
// TODO(alexeykuzmin): Skip the test instead of marking it as passed. // TODO(alexeykuzmin): Skip the test instead of marking it as passed.
if (process.env.APPVEYOR === 'True') return done() if (process.env.APPVEYOR === 'True') return done()
if (process.env.TRAVIS === 'true') return done()
this.timeout(180000) this.timeout(180000)
@ -76,7 +75,6 @@ describe('crashReporter module', () => {
it('should send minidump when node processes crash', function (done) { it('should send minidump when node processes crash', function (done) {
// TODO(alexeykuzmin): Skip the test instead of marking it as passed. // TODO(alexeykuzmin): Skip the test instead of marking it as passed.
if (process.env.APPVEYOR === 'True') return done() if (process.env.APPVEYOR === 'True') return done()
if (process.env.TRAVIS === 'true') return done()
this.timeout(180000) this.timeout(180000)
@ -172,7 +170,6 @@ describe('crashReporter module', () => {
it('should send minidump with updated extra parameters', function (done) { it('should send minidump with updated extra parameters', function (done) {
// TODO(alexeykuzmin): Skip the test instead of marking it as passed. // TODO(alexeykuzmin): Skip the test instead of marking it as passed.
if (process.env.APPVEYOR === 'True') return done() if (process.env.APPVEYOR === 'True') return done()
if (process.env.TRAVIS === 'true') return done()
this.timeout(180000) this.timeout(180000)
@ -261,11 +258,9 @@ describe('crashReporter module', () => {
describe('getLastCrashReport', () => { describe('getLastCrashReport', () => {
it('correctly returns the most recent report', () => { it('correctly returns the most recent report', () => {
if (process.env.TRAVIS === 'False') {
const reports = crashReporter.getUploadedReports() const reports = crashReporter.getUploadedReports()
const lastReport = reports[0] const lastReport = reports[0]
assert(lastReport != null) assert(lastReport != null)
}
}) })
}) })

View file

@ -686,12 +686,6 @@ describe('protocol module', () => {
}) })
it('sends error when callback is called with nothing', function (done) { it('sends error when callback is called with nothing', function (done) {
if (process.env.TRAVIS === 'true') {
// FIXME(alexeykuzmin): Skip the test.
// this.skip()
return done()
}
protocol.interceptBufferProtocol('http', emptyHandler, (error) => { protocol.interceptBufferProtocol('http', emptyHandler, (error) => {
if (error) return done(error) if (error) return done(error)
$.ajax({ $.ajax({

View file

@ -30,12 +30,6 @@ describe('chromium feature', () => {
describe('heap snapshot', () => { describe('heap snapshot', () => {
it('does not crash', function () { it('does not crash', function () {
if (process.env.TRAVIS === 'true') {
// FIXME(alexeykuzmin): Skip the test.
// this.skip()
return
}
process.atomBinding('v8_util').takeHeapSnapshot() process.atomBinding('v8_util').takeHeapSnapshot()
}) })
}) })
@ -173,12 +167,6 @@ describe('chromium feature', () => {
}) })
describe('window.open', () => { describe('window.open', () => {
before(function () {
if (process.env.TRAVIS === 'true' && process.platform === 'darwin') {
this.skip()
}
})
it('returns a BrowserWindowProxy object', () => { it('returns a BrowserWindowProxy object', () => {
const b = window.open('about:blank', '', 'show=no') const b = window.open('about:blank', '', 'show=no')
assert.equal(b.closed, false) assert.equal(b.closed, false)

View file

@ -135,12 +135,6 @@ describe('node feature', () => {
describe('contexts', () => { describe('contexts', () => {
describe('setTimeout in fs callback', () => { describe('setTimeout in fs callback', () => {
before(function () {
if (process.env.TRAVIS === 'true') {
this.skip()
}
})
it('does not crash', (done) => { it('does not crash', (done) => {
fs.readFile(__filename, () => { fs.readFile(__filename, () => {
setTimeout(done, 0) setTimeout(done, 0)

View file

@ -2,7 +2,6 @@
"name": "electron-test", "name": "electron-test",
"version": "0.1.0", "version": "0.1.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true,
"dependencies": { "dependencies": {
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",

View file

@ -416,12 +416,6 @@ describe('<webview> tag', function () {
}) })
describe('allowpopups attribute', () => { describe('allowpopups attribute', () => {
before(function () {
if (process.env.TRAVIS === 'true' && process.platform === 'darwin') {
this.skip()
}
})
it('can not open new window when not set', (done) => { it('can not open new window when not set', (done) => {
const listener = (e) => { const listener = (e) => {
assert.equal(e.message, 'null') assert.equal(e.message, 'null')
@ -506,12 +500,6 @@ describe('<webview> tag', function () {
}) })
describe('new-window event', () => { describe('new-window event', () => {
before(function () {
if (process.env.TRAVIS === 'true' && process.platform === 'darwin') {
this.skip()
}
})
it('emits when window.open is called', (done) => { it('emits when window.open is called', (done) => {
webview.addEventListener('new-window', (e) => { webview.addEventListener('new-window', (e) => {
assert.equal(e.url, 'http://host/') assert.equal(e.url, 'http://host/')
@ -840,12 +828,6 @@ describe('<webview> tag', function () {
describe('executeJavaScript', () => { describe('executeJavaScript', () => {
it('should support user gesture', function (done) { it('should support user gesture', function (done) {
if (process.env.TRAVIS !== 'true' || process.platform === 'darwin') {
// FIXME(alexeykuzmin): Skip the test.
// this.skip()
return done()
}
const listener = () => { const listener = () => {
webview.removeEventListener('enter-html-full-screen', listener) webview.removeEventListener('enter-html-full-screen', listener)
done() done()
@ -862,12 +844,6 @@ describe('<webview> tag', function () {
}) })
it('can return the result of the executed script', function (done) { it('can return the result of the executed script', function (done) {
if (process.env.TRAVIS === 'true' && process.platform === 'darwin') {
// FIXME(alexeykuzmin): Skip the test.
// this.skip()
return done()
}
const listener = () => { const listener = () => {
const jsScript = "'4'+2" const jsScript = "'4'+2"
webview.executeJavaScript(jsScript, false, (result) => { webview.executeJavaScript(jsScript, false, (result) => {
@ -1579,12 +1555,6 @@ describe('<webview> tag', function () {
}) })
it('can be manually resized with setSize even when attribute is present', function (done) { it('can be manually resized with setSize even when attribute is present', function (done) {
if (process.env.TRAVIS === 'true') {
// FIXME(alexeykuzmin): Skip the test.
// this.skip()
return done()
}
w = new BrowserWindow({show: false, width: 200, height: 200}) w = new BrowserWindow({show: false, width: 200, height: 200})
w.loadURL(`file://${fixtures}/pages/webview-no-guest-resize.html`) w.loadURL(`file://${fixtures}/pages/webview-no-guest-resize.html`)