Fix cancelled type handling
							parent
							
								
									ed96672136
								
							
						
					
					
						commit
						e8a38e4d15
					
				| 
						 | 
					@ -331,16 +331,16 @@ async def test_nested_multierrors(loglevel, start_method):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                    # windows is often too slow and cancellation seems
 | 
					                    # windows is often too slow and cancellation seems
 | 
				
			||||||
                    # to happen before an actor is spawned
 | 
					                    # to happen before an actor is spawned
 | 
				
			||||||
                    if subexc is trio.Cancelled:
 | 
					                    if isinstance(subexc, trio.Cancelled):
 | 
				
			||||||
                        continue
 | 
					                        continue
 | 
				
			||||||
 | 
					                    else:
 | 
				
			||||||
                    # on windows it seems we can't exactly be sure wtf
 | 
					                        # on windows it seems we can't exactly be sure wtf
 | 
				
			||||||
                    # will happen..
 | 
					                        # will happen..
 | 
				
			||||||
                    assert subexc.type in (
 | 
					                        assert subexc.type in (
 | 
				
			||||||
                        tractor.RemoteActorError,
 | 
					                            tractor.RemoteActorError,
 | 
				
			||||||
                        trio.Cancelled,
 | 
					                            trio.Cancelled,
 | 
				
			||||||
                        trio.MultiError
 | 
					                            trio.MultiError
 | 
				
			||||||
                    )
 | 
					                        )
 | 
				
			||||||
                else:
 | 
					                else:
 | 
				
			||||||
                    assert isinstance(subexc, tractor.RemoteActorError)
 | 
					                    assert isinstance(subexc, tractor.RemoteActorError)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue