File 0001-snapdtool-fix-unit-tests-when-running-on-d... of Package snapd

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-snapdtool-fix-unit-tests-when-running-on-distro-usin.patch of Package snapd (Revision fb1356a3faeae0fb26b317ef10ca8180)

Currently displaying revision fb1356a3faeae0fb26b317ef10ca8180 , Show latest

From 7edcefcc472e989dc7ebda831be8a5570bfd1538 Mon Sep 17 00:00:00 2001
Message-ID: <7edcefcc472e989dc7ebda831be8a5570bfd1538.1712841002.git.maciej.borzecki@canonical.com>
From: Maciej Borzecki <maciej.borzecki@canonical.com>
Date: Thu, 11 Apr 2024 15:07:12 +0200
Subject: [PATCH] snapdtool: fix unit tests when running on distro using
 /usr/libexec/snapd
Upstream: submitted, https://github.com/snapcore/snapd/pull/13818

Distros like openSUSE Tumbleweed or Fedora use /usr/libexec/snapd. Update the
test to account for the correct path.

Signed-off-by: Maciej Borzecki <maciej.borzecki@canonical.com>
---
 snapdtool/tool_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snapdtool/tool_test.go b/snapdtool/tool_test.go
index 970e76d2f18528856a6c7cdb05fa8da6232535dd..79442ef9dd70fc7491a5f6f2f16779ba473094b4 100644
--- a/snapdtool/tool_test.go
+++ b/snapdtool/tool_test.go
@@ -354,7 +354,7 @@ func (s *toolSuite) TestInternalToolPathSnapdSnapNotExecutable(c *C) {
 	// the internal one is not executable
 	p, err := snapdtool.InternalToolPath("snapd")
 	c.Assert(err, IsNil)
-	c.Check(p, Equals, filepath.Join(dirs.GlobalRootDir, "/usr/lib/snapd/snapd"))
+	c.Check(p, Equals, filepath.Join(dirs.DistroLibExecDir, "snapd"))
 }
 
 func (s *toolSuite) TestInternalToolPathWithLibexecdirLocation(c *C) {
-- 
2.44.0

Places

File 0001-snapdtool-fix-unit-tests-when-running-on-distro-usin.patch of Package snapd (Revision fb1356a3faeae0fb26b317ef10ca8180)

Places