From ad045de1f081d796910d07bd9154a1623d8329c9 Mon Sep 17 00:00:00 2001
From: Charles Gagnon <chgagnon@microsoft.com>
Date: Fri, 26 Feb 2021 14:40:26 -0800
Subject: [PATCH] Fix azdata tests (#14471)

* Fix azdata tests

* More fixes
---
 extensions/azdata/src/test/azdata.test.ts | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/extensions/azdata/src/test/azdata.test.ts b/extensions/azdata/src/test/azdata.test.ts
index 7bd45559aa..d4a35f5298 100644
--- a/extensions/azdata/src/test/azdata.test.ts
+++ b/extensions/azdata/src/test/azdata.test.ts
@@ -473,6 +473,7 @@ describe('azdata', function () {
 		beforeEach(function (): void {
 			showInformationMessageStub = sinon.stub(vscode.window, 'showInformationMessage').returns(Promise.resolve(<any>loc.yes));
 			executeSudoCommandStub = sinon.stub(childProcess, 'executeSudoCommand').returns(Promise.resolve({ stdout: '', stderr: '' }));
+			sinon.stub(HttpClient, 'getTextContent').resolves(JSON.stringify(releaseJson));
 		});
 
 		it('successful update', async function (): Promise<void> {
@@ -577,7 +578,6 @@ describe('azdata', function () {
 
 		describe('discoverLatestAvailableAzdataVersion', function (): void {
 			it('finds latest available version of azdata successfully', async function (): Promise<void> {
-				sinon.stub(HttpClient, 'getTextContent').resolves(JSON.stringify(releaseJson));
 				await azdata.discoverLatestAvailableAzdataVersion();
 			});
 		});
@@ -706,7 +706,6 @@ async function testWin32UnsuccessfulUpdate() {
 }
 
 async function testLinuxSuccessfulUpdate(userRequested = false) {
-	sinon.stub(HttpClient, 'getTextContent').returns(Promise.resolve(JSON.stringify(releaseJson)));
 	const executeCommandStub = sinon.stub(childProcess, 'executeCommand').returns(Promise.resolve({ stdout: '0.0.0', stderr: '' }));
 	executeSudoCommandStub.resolves({ stdout: '0.0.0', stderr: '' });
 	await azdata.checkAndUpdateAzdata(oldAzdataMock, userRequested);
@@ -740,7 +739,6 @@ async function testDarwinSuccessfulUpdate(userRequested = false) {
 
 
 async function testWin32SuccessfulUpdate(userRequested = false) {
-	sinon.stub(HttpClient, 'getTextContent').returns(Promise.resolve(JSON.stringify(releaseJson)));
 	sinon.stub(HttpClient, 'downloadFile').returns(Promise.resolve(__filename));
 	await azdata.checkAndUpdateAzdata(oldAzdataMock, userRequested);
 	should(executeSudoCommandStub.calledOnce).be.true('executeSudoCommand should have been called once');
@@ -748,7 +746,6 @@ async function testWin32SuccessfulUpdate(userRequested = false) {
 }
 
 async function testLinuxSkippedUpdate() {
-	sinon.stub(HttpClient, 'getTextContent').returns(Promise.resolve(JSON.stringify(releaseJson)));
 	executeSudoCommandStub.resolves({ stdout: '0.0.0', stderr: '' });
 	await azdata.checkAndUpdateAzdata(currentAzdataMock);
 	should(executeSudoCommandStub.callCount).be.equal(0, 'executeSudoCommand was not expected to be called');
@@ -778,14 +775,12 @@ async function testDarwinSkippedUpdateDontPrompt() {
 }
 
 async function testWin32SkippedUpdateDontPrompt() {
-	sinon.stub(HttpClient, 'getTextContent').returns(Promise.resolve(JSON.stringify(releaseJson)));
 	sinon.stub(HttpClient, 'downloadFile').returns(Promise.resolve(__filename));
 	await azdata.checkAndUpdateAzdata(oldAzdataMock);
 	should(executeSudoCommandStub.notCalled).be.true('executeSudoCommand should not have been called');
 }
 
 async function testLinuxSkippedUpdateDontPrompt() {
-	sinon.stub(HttpClient, 'getTextContent').returns(Promise.resolve(JSON.stringify(releaseJson)));
 	sinon.stub(childProcess, 'executeCommand').returns(Promise.resolve({ stdout: '0.0.0', stderr: '' }));
 	executeSudoCommandStub.resolves({ stdout: '0.0.0', stderr: '' });
 	await azdata.checkAndUpdateAzdata(oldAzdataMock);
@@ -816,7 +811,6 @@ async function testDarwinSkippedUpdate() {
 }
 
 async function testWin32SkippedUpdate() {
-	sinon.stub(HttpClient, 'getTextContent').returns(Promise.resolve(JSON.stringify(releaseJson)));
 	sinon.stub(HttpClient, 'downloadFile').returns(Promise.resolve(__filename));
 	await azdata.checkAndUpdateAzdata(currentAzdataMock);
 	should(executeSudoCommandStub.notCalled).be.true('executeSudoCommand should not have been called');
@@ -849,7 +843,6 @@ async function testLinuxSkippedInstall() {
 }
 
 async function testWin32SkippedInstall() {
-	sinon.stub(HttpClient, 'getTextContent').returns(Promise.resolve(JSON.stringify(releaseJson)));
 	sinon.stub(HttpClient, 'downloadFile').returns(Promise.resolve(__filename));
 	sinon.stub(childProcess, 'executeCommand')
 		.onFirstCall()
@@ -863,7 +856,6 @@ async function testWin32SkippedInstall() {
 }
 
 async function testWin32SuccessfulInstall() {
-	sinon.stub(HttpClient, 'getTextContent').returns(Promise.resolve(JSON.stringify(releaseJson)));
 	sinon.stub(HttpClient, 'downloadFile').returns(Promise.resolve(__filename));
 	const executeCommandStub = sinon.stub(childProcess, 'executeCommand')
 		.onFirstCall()