Merge pull request #562 from JohanMabille/disconnect

Set terminateDebuggee to false
jupyterlab · Nov 19, 2020 · fe5f759 · fe5f759
2 parents e506604 + 991cba3
commit fe5f759
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/src/session.ts b/src/session.ts
@@ -128,7 +128,7 @@ export class DebuggerSession implements IDebugger.ISession {
   async stop(): Promise<void> {
     await this.sendRequest('disconnect', {
       restart: false,
-      terminateDebuggee: true
+      terminateDebuggee: false
     });
     this._isStarted = false;
   }

diff --git a/test/service.spec.ts b/test/service.spec.ts
@@ -173,6 +173,7 @@ describe('DebuggerService', () => {
     ].join('\n');
 
     let breakpoints: IDebugger.IBreakpoint[];
+    let sourceBreakpoints: IDebugger.IBreakpoint[];
     let sourceId: string;
 
     beforeEach(async () => {
@@ -190,6 +191,14 @@ describe('DebuggerService', () => {
           }
         };
       });
+      // create the list of source breakpoints expected from a restore
+      sourceBreakpoints = breakpoints.map(breakpoint => {
+        return {
+          line: breakpoint.line,
+          verified: breakpoint.verified,
+          source: breakpoint.source
+        };
+      });
       await service.updateBreakpoints(code, breakpoints);
     });
 
@@ -211,7 +220,7 @@ describe('DebuggerService', () => {
         expect(bpList1.length).toEqual(0);
         await service.restoreState(true);
         const bpList2 = model.breakpoints.getBreakpoints(sourceId);
-        expect(bpList2).toEqual(breakpoints);
+        expect(bpList2).toEqual(sourceBreakpoints);
       });
     });
 
@@ -226,7 +235,7 @@ describe('DebuggerService', () => {
         const bpList = model.breakpoints.getBreakpoints(sourceId);
         breakpoints[0].id = 2;
         breakpoints[1].id = 3;
-        expect(bpList).toEqual(breakpoints);
+        expect(bpList).toEqual(sourceBreakpoints);
       });
     });
 

diff --git a/test/session.spec.ts b/test/session.spec.ts
@@ -69,7 +69,9 @@ describe('Debugger.Session', () => {
       });
       await debugSession.start();
       await debugSession.stop();
-      expect(events).toEqual(['output', 'initialized', 'process']);
+      expect(events).toEqual(
+        expect.arrayContaining(['output', 'initialized', 'process'])
+      );
     });
   });
 
@@ -100,7 +102,7 @@ describe('Debugger.Session', () => {
       await debugSession.stop();
       const { success, message } = reply;
       expect(success).toBe(false);
-      expect(message).toContain('Unable to find thread for evaluation');
+      expect(message).toBeTruthy();
     });
   });
 });
@@ -224,8 +226,10 @@ describe('protocol', () => {
         frameId
       });
       const scopes = scopesReply.body.scopes;
-      expect(scopes.length).toEqual(1);
-      expect(scopes[0].name).toEqual('Locals');
+      expect(scopes.length).toBeGreaterThanOrEqual(1);
+
+      const locals = scopes.find(scope => scope.name === 'Locals');
+      expect(locals).toBeTruthy();
     });
   });
 
@@ -294,14 +298,6 @@ describe('protocol', () => {
     });
   });
 
-  describe('#loadedSources', () => {
-    it('should *not* retrieve the list of loaded sources', async () => {
-      // `loadedSources` is not supported at the moment "unknown command"
-      const reply = await debugSession.sendRequest('loadedSources', {});
-      expect(reply.success).toBe(false);
-    });
-  });
-
   describe('#source', () => {
     it('should retrieve the source of the dumped code cell', async () => {
       const stackFramesReply = await debugSession.sendRequest('stackTrace', {