fix merge conflicts

Author: Hweinstock

packages/core/src/test/awsService/ec2/activation.test.ts

@@ -7,7 +7,7 @@ import * as sinon from 'sinon'
 import { assertTelemetry } from '../../testUtil'
 import { Ec2InstanceNode } from '../../../awsService/ec2/explorer/ec2InstanceNode'
 import { Ec2ParentNode } from '../../../awsService/ec2/explorer/ec2ParentNode'
-import { Ec2Client } from '../../../shared/clients/ec2Client'
+import { Ec2Wrapper, SafeEc2Instance } from '../../../shared/clients/ec2Wrapper'
 import { Ec2Connecter } from '../../../awsService/ec2/model'
 import { PollingSet } from '../../../shared/utilities/pollingSet'
 
@@ -20,12 +20,12 @@ describe('ec2 activation', function () {
         // Don't want to be polling here, that is tested in ../ec2ParentNode.test.ts
         // disabled here for convenience (avoiding race conditions with timeout)
         sinon.stub(PollingSet.prototype, 'start')
-        const testClient = new Ec2Client(testRegion)
-        const parentNode = new Ec2ParentNode(testRegion, testPartition, new Ec2Client(testRegion))
+        const testClient = new Ec2Wrapper(testRegion)
+        const parentNode = new Ec2ParentNode(testRegion, testPartition, new Ec2Wrapper(testRegion))
         testNode = new Ec2InstanceNode(parentNode, testClient, testRegion, testPartition, {
             InstanceId: 'testId',
             LastSeenStatus: 'status',
-        })
+        } as SafeEc2Instance)
     })
 
     after(function () {
@@ -39,7 +39,7 @@ describe('ec2 activation', function () {
         assertTelemetry('ec2_connectToInstance', { ec2ConnectionType: 'ssm' })
         terminalStub.restore()
 
-        const stopInstanceStub = sinon.stub(Ec2Client.prototype, 'stopInstanceWithCancel')
+        const stopInstanceStub = sinon.stub(Ec2Wrapper.prototype, 'stopInstanceWithCancel')
         await vscode.commands.executeCommand('aws.ec2.stopInstance', testNode)
 
         assertTelemetry('ec2_changeState', { ec2InstanceState: 'stop' })