avoid duplicate function call, make test symmetric

TH3CHARLie · TH3CHARLie · commit 47f9f25974ef · 2019-11-07T09:42:49.000+08:00
diff --git a/mypy/checkexpr.py b/mypy/checkexpr.py
@@ -3538,7 +3538,7 @@ def visit_conditional_expr(self, e: ConditionalExpr) -> Type:
         full_context_else_type = self.analyze_cond_branch(else_map, e.else_expr, context=ctx)
         if not mypy.checker.is_valid_inferred_type(if_type):
             # Analyze the right branch disregarding the left branch.
-            else_type = self.analyze_cond_branch(else_map, e.else_expr, context=ctx)
+            else_type = full_context_else_type
 
             # If it would make a difference, re-analyze the left
             # branch using the right branch's type as context.
diff --git a/test-data/unit/check-unions.test b/test-data/unit/check-unions.test
@@ -1007,6 +1007,9 @@ do_thing_with_enums(boop)  # E: Argument 1 to "do_thing_with_enums" has incompat
 
 [case testAssignUnionWithTenaryExprWithEmptyCollection]
 from typing import Dict, List, Union
-x: Union[int, List[int]] = 1 if "" else []
-y: Union[int, Dict[int, int]] = 1 if "" else {}
+x: Union[int, List[int]] = 1 if bool() else []
+y: Union[int, Dict[int, int]] = 1 if bool() else {}
+
+u: Union[int, List[int]] = [] if bool() else 1
+v: Union[int, Dict[int, int]] = {} if bool() else 1
 [builtins fixtures/isinstancelist.pyi]
