Skip to content

Commit

Permalink
remove e2e changes (will readded in another PR)
Browse files Browse the repository at this point in the history
  • Loading branch information
rileyajones committed Apr 12, 2021
1 parent d1c0283 commit 7594429
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 66 deletions.
1 change: 0 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,6 @@ jobs:
- run:
name: 'End-to-End Tests'
command: node build-system/pr-check/e2e-tests.js
- store_test_output
- fail_fast
- teardown_vm
'Performance Tests':
Expand Down
20 changes: 3 additions & 17 deletions build-system/tasks/e2e/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,16 @@ const fs = require('fs');
const glob = require('glob');
const http = require('http');
const Mocha = require('mocha');
const MochaJUnitReporter = require('mocha-junit-reporter');
const path = require('path');
const {
createCtrlcHandler,
exitCtrlcHandler,
} = require('../../common/ctrlcHandler');
const {buildRuntime, getFilesFromArgv} = require('../../common/utils');
const {createMultiplexedReporter} = require('./mocha-report-multiplexer');
const {cyan} = require('kleur/colors');
const {execOrDie} = require('../../common/exec');
const {HOST, PORT, startServer, stopServer} = require('../serve');
const {isCiBuild, isCircleciBuild} = require('../../common/ci');
const {isCiBuild} = require('../../common/ci');
const {log} = require('../../common/logging');
const {maybePrintCoverageMessage} = require('../helpers');
const {reportTestStarted} = require('../report-test-status');
Expand Down Expand Up @@ -88,26 +86,14 @@ function createMocha_() {
reporter = dotsReporter;
}

const options = {
return new Mocha({
// e2e tests have a different standard for when a test is too slow,
// so we set a non-default threshold.
slow: SLOW_TEST_THRESHOLD_MS,
reporter,
retries: TEST_RETRIES,
fullStackTrace: true,
};

if (isCircleciBuild()) {
options.reporter = createMultiplexedReporter([
options.reporter,
MochaJUnitReporter,
]);
options.reporterOptions = {
mochaFile: 'result-reports/e2e.xml',
};
}

return new Mocha(options);
});
}

/**
Expand Down
48 changes: 0 additions & 48 deletions build-system/tasks/e2e/mocha-report-multiplexer.js

This file was deleted.

0 comments on commit 7594429

Please sign in to comment.