From 80025804b3785b880e8b3f2c81bfb298d2364d5c Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Wed, 15 May 2019 11:47:15 -0700
Subject: [PATCH 1/3] Add sanity check in AccessibilityManager

Fixes #2082
---
 src/AccessibilityManager.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/AccessibilityManager.ts b/src/AccessibilityManager.ts
index 1f44c132..4351a336 100644
--- a/src/AccessibilityManager.ts
+++ b/src/AccessibilityManager.ts
@@ -249,9 +249,11 @@ export class AccessibilityManager extends Disposable {
       const lineData = buffer.translateBufferLineToString(buffer.ydisp + i, true);
       const posInSet = (buffer.ydisp + i + 1).toString();
       const element = this._rowElements[i];
-      element.textContent = lineData.length === 0 ? Strings.blankLine : lineData;
-      element.setAttribute('aria-posinset', posInSet);
-      element.setAttribute('aria-setsize', setSize);
+      if (element) {
+        element.textContent = lineData.length === 0 ? Strings.blankLine : lineData;
+        element.setAttribute('aria-posinset', posInSet);
+        element.setAttribute('aria-setsize', setSize);
+      }
     }
   }
 

From da79fec5c2fa0dd7ed7ca23901e7e24e58f11812 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Wed, 15 May 2019 11:57:32 -0700
Subject: [PATCH 2/3] Disable failing test on Linux

---
 src/Terminal.integration.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Terminal.integration.ts b/src/Terminal.integration.ts
index 5e12d2a3..84dfbf8b 100644
--- a/src/Terminal.integration.ts
+++ b/src/Terminal.integration.ts
@@ -113,8 +113,12 @@ if (os.platform() !== 'win32') {
       51, 52, 54, 55, 56, 57, 58, 59, 60, 61,
       63, 68
     ];
+    // These are failing on Linux only
+    if (os.platform() === 'linux') {
+      skip.push(0);
+    }
+    // These are failing on macOS only
     if (os.platform() === 'darwin') {
-      // These are failing on macOS only
       skip.push(3, 7, 11, 67);
     }
     for (let i = 0; i < files.length; i++) {

From a62ec679bdaaba07da6c709d4c79e6f054032cdb Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Wed, 15 May 2019 12:49:13 -0700
Subject: [PATCH 3/3] Move readFileSync out of test

---
 src/Terminal.integration.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Terminal.integration.ts b/src/Terminal.integration.ts
index 84dfbf8b..fa4403f4 100644
--- a/src/Terminal.integration.ts
+++ b/src/Terminal.integration.ts
@@ -113,10 +113,6 @@ if (os.platform() !== 'win32') {
       51, 52, 54, 55, 56, 57, 58, 59, 60, 61,
       63, 68
     ];
-    // These are failing on Linux only
-    if (os.platform() === 'linux') {
-      skip.push(0);
-    }
     // These are failing on macOS only
     if (os.platform() === 'darwin') {
       skip.push(3, 7, 11, 67);
@@ -126,9 +122,9 @@ if (os.platform() !== 'win32') {
         continue;
       }
       ((filename: string) => {
+        const inFile = fs.readFileSync(filename, 'utf8');
         it(filename.split('/').slice(-1)[0], done => {
           ptyReset(() => {
-            const inFile = fs.readFileSync(filename, 'utf8');
             ptyWriteRead(inFile, fromPty => {
               // uncomment this to get log from terminal
               // console.log = function(){};