Bring more non-web smoke test code back

This commit is contained in:
Daniel Imms 2019-07-19 17:16:04 -07:00
parent 8d20c171fc
commit 88c8745851
3 changed files with 10 additions and 9 deletions

View file

@ -66,8 +66,8 @@ export class Application {
async start(expectWalkthroughPart = true): Promise<any> {
await this._start();
// web doesn't show explorer?
// await this.code.waitForElement('.explorer-folders-view');
// TODO: web doesn't show explorer?
await this.code.waitForElement('.explorer-folders-view');
if (expectWalkthroughPart) {
await this.code.waitForActiveElement(`.editor-instance[id="workbench.editor.walkThroughPart"] > div > div[tabIndex="0"]`);
@ -138,11 +138,12 @@ export class Application {
}
await this.code.waitForWindowIds(ids => ids.length > 0);
// await this.code.waitForElement('.monaco-workbench');
// TODO: Remove on web?
await this.code.waitForElement('.monaco-workbench');
// if (this.remote) {
// await this.code.waitForElement('.monaco-workbench .statusbar-item[title="Editing on TestResolver"]');
// }
if (this.remote) {
await this.code.waitForElement('.monaco-workbench .statusbar-item[title="Editing on TestResolver"]');
}
// wait a bit, since focus might be stolen off widgets
// as soon as they open (e.g. quick open)

View file

@ -8,7 +8,6 @@ import { Application } from '../../application';
export function setup() {
describe('Terminal', () => {
it(`opens terminal, runs 'echo' and verifies the output`, async function () {
this.timeout(60 * 5000);
const app = this.app as Application;
const expected = new Date().getTime().toString();

View file

@ -71,9 +71,10 @@ async function connect(connectDriver: typeof connectElectronDriver, child: cp.Ch
const { client, driver } = await connectDriver(outPath, handlePath);
return new Code(client, driver, logger);
} catch (err) {
console.log('err', err);
if (++errCount > 50) {
// child.kill();
if (child) {
child.kill();
}
throw err;
}