From 2d07e59521cd774ef56f21129672b23221860fc9 Mon Sep 17 00:00:00 2001
From: Tom Natan <tomnatan@google.com>
Date: Fri, 15 Nov 2024 11:16:47 -0800
Subject: [PATCH] #sdy unskip test and change to correct result now that we
 resolve real conflicts.

PiperOrigin-RevId: 696945866
---
 xla/service/spmd/shardy/shardy_xla_pass_test.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/xla/service/spmd/shardy/shardy_xla_pass_test.cc b/xla/service/spmd/shardy/shardy_xla_pass_test.cc
index 4f612394bf35c..6cb846048cff7 100644
--- a/xla/service/spmd/shardy/shardy_xla_pass_test.cc
+++ b/xla/service/spmd/shardy/shardy_xla_pass_test.cc
@@ -246,7 +246,6 @@ TEST_F(ShardyXLATest, DotMergeOperands1) {
 }
 
 TEST_F(ShardyXLATest, DotMergeOperands2) {
-  GTEST_SKIP() << "Temporarily skip failing test until Shardy fix is in.";
   const char* const hloString = R"(
     HloModule module
     ENTRY %conv {
@@ -267,7 +266,7 @@ TEST_F(ShardyXLATest, DotMergeOperands2) {
               op::Sharding("{devices=[2,2,2]<=[8]}"));
 
   EXPECT_THAT(module->entry_computation()->root_instruction(),
-              op::Sharding("{devices=[2,1,1,4]<=[8] last_tile_dim_replicate}"));
+              op::Sharding("{devices=[2,2,1,2]<=[8] last_tile_dim_replicate}"));
 }
 
 TEST_F(ShardyXLATest, DotMergeOperands3) {