From 2a8982b27b82b37d67bd67f1ea1b7f8c394c3a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= <kwilczynski@redhat.com>
Date: Wed, 25 Oct 2023 19:53:50 +0900
Subject: [PATCH] Remove problematic Dbus restart test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Krzysztof Wilczyński <kwilczynski@redhat.com>
---
 test/e2e_node/node_shutdown_linux_test.go | 35 -----------------------
 1 file changed, 35 deletions(-)

diff --git a/test/e2e_node/node_shutdown_linux_test.go b/test/e2e_node/node_shutdown_linux_test.go
index 591cb5a0c55..c5d797dc2f8 100644
--- a/test/e2e_node/node_shutdown_linux_test.go
+++ b/test/e2e_node/node_shutdown_linux_test.go
@@ -374,35 +374,6 @@ var _ = SIGDescribe("GracefulNodeShutdown [Serial] [NodeFeature:GracefulNodeShut
 				return nil
 			}, nodeStatusUpdateTimeout, pollInterval).Should(gomega.Succeed())
 		})
-
-		ginkgo.It("after restart dbus, should be able to gracefully shutdown", func(ctx context.Context) {
-			// allows manual restart of dbus to work in Ubuntu.
-			err := overlayDbusConfig()
-			framework.ExpectNoError(err)
-			defer func() {
-				err := restoreDbusConfig()
-				framework.ExpectNoError(err)
-			}()
-
-			ginkgo.By("Restart Dbus")
-			err = restartDbus()
-			framework.ExpectNoError(err)
-
-			gomega.Eventually(ctx, func(ctx context.Context) error {
-				// re-send the shutdown signal in case the dbus restart is not done
-				ginkgo.By("Emitting Shutdown signal")
-				err = emitSignalPrepareForShutdown(true)
-				if err != nil {
-					return err
-				}
-
-				isReady := getNodeReadyStatus(ctx, f)
-				if isReady {
-					return fmt.Errorf("node did not become shutdown as expected")
-				}
-				return nil
-			}, nodeStatusUpdateTimeout, pollInterval).Should(gomega.Succeed())
-		})
 	})
 
 	ginkgo.Context("when gracefully shutting down with Pod priority", func() {
@@ -680,12 +651,6 @@ func getNodeReadyStatus(ctx context.Context, f *framework.Framework) bool {
 	return isNodeReady(&nodeList.Items[0])
 }
 
-func restartDbus() error {
-	cmd := "systemctl restart dbus"
-	_, err := runCommand("sh", "-c", cmd)
-	return err
-}
-
 func systemctlDaemonReload() error {
 	cmd := "systemctl daemon-reload"
 	_, err := runCommand("sh", "-c", cmd)