fix(app): temporary fix for chained command race conditions in cal fl…

…ows to unblock user testing (#6530) Temporary patch to unblock user testing calibration flows. Introduces a third of a second delay between the first and second of two chained commands through out calibration flows on the run app. This should immediately be addressed by a more robust epic-based solution.
Opentrons · Sep 11, 2020 · 3c17d9e · 3c17d9e
1 parent a269b0f
commit 3c17d9e
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 6 deletions.
diff --git a/app/src/components/CalibrateDeck/CompleteConfirmation.js b/app/src/components/CalibrateDeck/CompleteConfirmation.js
@@ -22,7 +22,10 @@ export function CompleteConfirmation(
 ): React.Node {
   const exitSession = () => {
     props.sendSessionCommand(Sessions.deckCalCommands.EXIT)
-    props.deleteSession()
+    // TODO: IMMEDIATELY use actualy epic for managing chained dependent commands
+    setTimeout(() => {
+      props.deleteSession()
+    }, 300)
   }
   return (
     <Flex

diff --git a/app/src/components/CalibrateDeck/SaveXYPoint.js b/app/src/components/CalibrateDeck/SaveXYPoint.js
@@ -125,7 +125,10 @@ export function SaveXYPoint(props: CalibrateDeckChildProps): React.Node {
 
   const savePoint = () => {
     sendSessionCommand(Sessions.deckCalCommands.SAVE_OFFSET)
-    sendSessionCommand(proceedCommand)
+    // TODO: IMMEDIATELY use actualy epic for managing chained dependent commands
+    setTimeout(() => {
+      sendSessionCommand(proceedCommand)
+    }, 300)
   }
 
   const buttonText = buttonTextByCurrentStep[currentStep] || ''

diff --git a/app/src/components/CalibrateDeck/SaveZPoint.js b/app/src/components/CalibrateDeck/SaveZPoint.js
@@ -67,7 +67,10 @@ export function SaveZPoint(props: CalibrateDeckChildProps): React.Node {
 
   const savePoint = () => {
     sendSessionCommand(Sessions.deckCalCommands.SAVE_OFFSET)
-    sendSessionCommand(Sessions.deckCalCommands.MOVE_TO_POINT_ONE)
+    // TODO: IMMEDIATELY use actualy epic for managing chained dependent commands
+    setTimeout(() => {
+      sendSessionCommand(Sessions.deckCalCommands.MOVE_TO_POINT_ONE)
+    }, 300)
   }
 
   return (

diff --git a/app/src/components/CalibrateDeck/__tests__/SaveXYPoint.test.js b/app/src/components/CalibrateDeck/__tests__/SaveXYPoint.test.js
@@ -25,6 +25,7 @@ describe('SaveXYPoint', () => {
   const getVideo = wrapper => wrapper.find(`source`)
 
   beforeEach(() => {
+    jest.useFakeTimers()
     render = (props = {}) => {
       const {
         pipMount = 'left',
@@ -48,6 +49,8 @@ describe('SaveXYPoint', () => {
   })
   afterEach(() => {
     jest.resetAllMocks()
+    jest.clearAllTimers()
+    jest.useRealTimers()
   })
 
   it('displays proper asset', () => {
@@ -150,6 +153,7 @@ describe('SaveXYPoint', () => {
         .invoke('onClick')()
     )
     wrapper.update()
+    jest.runAllTimers()
 
     expect(mockSendCommand).toHaveBeenCalledWith(
       Sessions.deckCalCommands.SAVE_OFFSET
@@ -168,6 +172,7 @@ describe('SaveXYPoint', () => {
         .invoke('onClick')()
     )
     wrapper.update()
+    jest.runAllTimers()
 
     expect(mockSendCommand).toHaveBeenCalledWith(
       Sessions.deckCalCommands.SAVE_OFFSET
@@ -188,6 +193,7 @@ describe('SaveXYPoint', () => {
         .invoke('onClick')()
     )
     wrapper.update()
+    jest.runAllTimers()
 
     expect(mockSendCommand).toHaveBeenCalledWith(
       Sessions.deckCalCommands.SAVE_OFFSET

diff --git a/app/src/components/CalibrateDeck/__tests__/SaveZPoint.test.js b/app/src/components/CalibrateDeck/__tests__/SaveZPoint.test.js
@@ -24,6 +24,7 @@ describe('SaveZPoint', () => {
   const getVideo = wrapper => wrapper.find(`source`)
 
   beforeEach(() => {
+    jest.useFakeTimers()
     render = (props = {}) => {
       const {
         pipMount = 'left',
@@ -47,6 +48,8 @@ describe('SaveZPoint', () => {
   })
   afterEach(() => {
     jest.resetAllMocks()
+    jest.clearAllTimers()
+    jest.useRealTimers()
   })
 
   it('displays proper asset', () => {
@@ -106,6 +109,7 @@ describe('SaveZPoint', () => {
 
     act(() => getSaveButton(wrapper).invoke('onClick')())
     wrapper.update()
+    jest.runAllTimers()
 
     expect(mockSendCommand).toHaveBeenCalledWith(
       Sessions.deckCalCommands.SAVE_OFFSET

diff --git a/app/src/components/CalibrationPanels/CompleteConfirmation.js b/app/src/components/CalibrationPanels/CompleteConfirmation.js
@@ -35,7 +35,10 @@ export function CompleteConfirmation(props: CalibrationPanelProps): React.Node {
   // session command upon a successful exit response
   const exitSession = () => {
     props.sendSessionCommand(Sessions.sharedCalCommands.EXIT)
-    props.deleteSession()
+    // TODO: IMMEDIATELY use actualy epic for managing chained dependent commands
+    setTimeout(() => {
+      props.deleteSession()
+    }, 300)
   }
   return (
     <Flex

diff --git a/app/src/components/CalibrationPanels/SaveXYPoint.js b/app/src/components/CalibrationPanels/SaveXYPoint.js
@@ -147,7 +147,10 @@ export function SaveXYPoint(props: CalibrationPanelProps): React.Node {
 
   const savePoint = () => {
     sendSessionCommand(Sessions.sharedCalCommands.SAVE_OFFSET)
-    moveCommandString && sendSessionCommand(moveCommandString)
+    // TODO: IMMEDIATELY use actualy epic for managing chained dependent commands
+    setTimeout(() => {
+      moveCommandString && sendSessionCommand(moveCommandString)
+    }, 300)
   }
 
   return (

diff --git a/app/src/components/CalibrationPanels/SaveZPoint.js b/app/src/components/CalibrationPanels/SaveZPoint.js
@@ -90,7 +90,10 @@ export function SaveZPoint(props: CalibrationPanelProps): React.Node {
 
   const savePoint = () => {
     sendSessionCommand(Sessions.sharedCalCommands.SAVE_OFFSET)
-    sendSessionCommand(Sessions.sharedCalCommands.MOVE_TO_POINT_ONE)
+    // TODO: IMMEDIATELY use actualy epic for managing chained dependent commands
+    setTimeout(() => {
+      sendSessionCommand(Sessions.sharedCalCommands.MOVE_TO_POINT_ONE)
+    }, 300)
   }
 
   return (

diff --git a/app/src/components/CalibrationPanels/__tests__/CompleteConfirmation.test.js b/app/src/components/CalibrationPanels/__tests__/CompleteConfirmation.test.js
@@ -16,6 +16,7 @@ describe('CompleteConfirmation', () => {
     wrapper.find('button[title="Return tip to tip rack and exit"]')
 
   beforeEach(() => {
+    jest.useFakeTimers()
     render = (
       props: $Shape<React.ElementProps<typeof CompleteConfirmation>> = {}
     ) => {
@@ -44,6 +45,8 @@ describe('CompleteConfirmation', () => {
 
   afterEach(() => {
     jest.resetAllMocks()
+    jest.clearAllTimers()
+    jest.useRealTimers()
   })
 
   it('clicking continue sends exit command and deletes session', () => {
@@ -52,6 +55,7 @@ describe('CompleteConfirmation', () => {
     expect(wrapper.find('ConfirmClearDeckModal').exists()).toBe(false)
     getContinueButton(wrapper).invoke('onClick')()
     wrapper.update()
+    jest.runAllTimers()
     expect(mockDeleteSession).toHaveBeenCalled()
     expect(mockSendCommand).toHaveBeenCalledWith(
       Sessions.sharedCalCommands.EXIT

diff --git a/app/src/components/CalibrationPanels/__tests__/SaveXYPoint.test.js b/app/src/components/CalibrationPanels/__tests__/SaveXYPoint.test.js
@@ -27,6 +27,7 @@ describe('SaveXYPoint', () => {
   const getVideo = wrapper => wrapper.find(`source`)
 
   beforeEach(() => {
+    jest.useFakeTimers()
     render = (props = {}) => {
       const {
         pipMount = 'left',
@@ -52,6 +53,8 @@ describe('SaveXYPoint', () => {
   })
   afterEach(() => {
     jest.resetAllMocks()
+    jest.clearAllTimers()
+    jest.useRealTimers()
   })
 
   it('displays proper asset', () => {
@@ -155,6 +158,7 @@ describe('SaveXYPoint', () => {
     getSaveButton(wrapper).invoke('onClick')()
 
     wrapper.update()
+    jest.runAllTimers()
 
     expect(mockSendCommand).toHaveBeenCalledWith(
       Sessions.sharedCalCommands.SAVE_OFFSET
@@ -173,6 +177,7 @@ describe('SaveXYPoint', () => {
     expect(wrapper.text()).toContain('slot 3')
     getSaveButton(wrapper).invoke('onClick')()
     wrapper.update()
+    jest.runAllTimers()
 
     expect(mockSendCommand).toHaveBeenCalledWith(
       Sessions.sharedCalCommands.SAVE_OFFSET
@@ -191,6 +196,7 @@ describe('SaveXYPoint', () => {
     expect(wrapper.text()).toContain('slot 7')
     getSaveButton(wrapper).invoke('onClick')()
     wrapper.update()
+    jest.runAllTimers()
 
     expect(mockSendCommand).toHaveBeenCalledWith(
       Sessions.sharedCalCommands.SAVE_OFFSET
@@ -211,6 +217,7 @@ describe('SaveXYPoint', () => {
 
     getSaveButton(wrapper).invoke('onClick')()
     wrapper.update()
+    jest.runAllTimers()
     expect(mockSendCommand).toHaveBeenCalledWith(
       Sessions.sharedCalCommands.SAVE_OFFSET
     )

diff --git a/app/src/components/CalibrationPanels/__tests__/SaveZPoint.test.js b/app/src/components/CalibrationPanels/__tests__/SaveZPoint.test.js
@@ -20,6 +20,7 @@ describe('SaveZPoint', () => {
   const getVideo = wrapper => wrapper.find(`source`)
 
   beforeEach(() => {
+    jest.useFakeTimers()
     render = (props = {}) => {
       const {
         pipMount = 'left',
@@ -45,6 +46,8 @@ describe('SaveZPoint', () => {
   })
   afterEach(() => {
     jest.resetAllMocks()
+    jest.clearAllTimers()
+    jest.useRealTimers()
   })
 
   it('displays proper asset', () => {
@@ -104,6 +107,7 @@ describe('SaveZPoint', () => {
 
     getSaveButton(wrapper).invoke('onClick')()
     wrapper.update()
+    jest.runAllTimers()
 
     expect(mockSendCommand).toHaveBeenCalledWith(
       Sessions.deckCalCommands.SAVE_OFFSET