diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-10-07 21:29:16 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-10-07 21:29:16 +0900 |
| commit | 5d18af00077ae6ba8ef686d1fd93d888f69681b2 (patch) | |
| tree | eff32422fe3ef095c6a915ccb41c2a10a06990f7 /internal/app/env_test.go | |
| parent | 0e6c1a50260de141c50bb50fd3f2b2bcf9a3fe64 (diff) | |
container/fhs: move pathname constants
This allows referencing FHS pathnames without importing container.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal/app/env_test.go')
| -rw-r--r-- | internal/app/env_test.go | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/internal/app/env_test.go b/internal/app/env_test.go index cf6a18b3..b28c1568 100644 --- a/internal/app/env_test.go +++ b/internal/app/env_test.go @@ -7,6 +7,7 @@ import ( "hakurei.app/container" "hakurei.app/container/check" + "hakurei.app/container/fhs" "hakurei.app/container/stub" "hakurei.app/hst" ) @@ -23,26 +24,26 @@ func TestEnvPaths(t *testing.T) { {"zero", new(EnvPaths), hst.Paths{}, "attempting to use an invalid EnvPaths"}, {"nil tempdir", &EnvPaths{ - RuntimePath: container.AbsFHSTmp, + RuntimePath: fhs.AbsTmp, }, hst.Paths{}, "attempting to use an invalid EnvPaths"}, {"nil runtime", &EnvPaths{ - TempDir: container.AbsFHSTmp, + TempDir: fhs.AbsTmp, }, hst.Paths{ - TempDir: container.AbsFHSTmp, - SharePath: container.AbsFHSTmp.Append("hakurei.3735928559"), - RuntimePath: container.AbsFHSTmp.Append("hakurei.3735928559/run/compat"), - RunDirPath: container.AbsFHSTmp.Append("hakurei.3735928559/run"), + TempDir: fhs.AbsTmp, + SharePath: fhs.AbsTmp.Append("hakurei.3735928559"), + RuntimePath: fhs.AbsTmp.Append("hakurei.3735928559/run/compat"), + RunDirPath: fhs.AbsTmp.Append("hakurei.3735928559/run"), }, ""}, {"full", &EnvPaths{ - TempDir: container.AbsFHSTmp, - RuntimePath: container.AbsFHSRunUser.Append("1000"), + TempDir: fhs.AbsTmp, + RuntimePath: fhs.AbsRunUser.Append("1000"), }, hst.Paths{ - TempDir: container.AbsFHSTmp, - SharePath: container.AbsFHSTmp.Append("hakurei.3735928559"), - RuntimePath: container.AbsFHSRunUser.Append("1000"), - RunDirPath: container.AbsFHSRunUser.Append("1000/hakurei"), + TempDir: fhs.AbsTmp, + SharePath: fhs.AbsTmp.Append("hakurei.3735928559"), + RuntimePath: fhs.AbsRunUser.Append("1000"), + RunDirPath: fhs.AbsRunUser.Append("1000/hakurei"), }, ""}, } for _, tc := range testCases { |