mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-01-30 04:52:27 +01:00
53 lines
2.0 KiB
Diff
53 lines
2.0 KiB
Diff
From 4b8ef2cbd7f27ebbc69626f5b05bd9e5e8f88ce5 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Neumann <alexander@bumpern.de>
|
|
Date: Sun, 13 Sep 2020 12:08:46 +0200
|
|
Subject: [PATCH] Fix tests
|
|
|
|
---
|
|
handlers_test.go | 27 +++++++++++++--------------
|
|
1 file changed, 13 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/handlers_test.go b/handlers_test.go
|
|
index abbba3e..65cdf92 100644
|
|
--- a/handlers_test.go
|
|
+++ b/handlers_test.go
|
|
@@ -16,25 +16,24 @@ import (
|
|
|
|
func TestJoin(t *testing.T) {
|
|
var tests = []struct {
|
|
- base, name string
|
|
- result string
|
|
+ base string
|
|
+ names []string
|
|
+ result string
|
|
}{
|
|
- {"/", "foo/bar", "/foo/bar"},
|
|
- {"/srv/server", "foo/bar", "/srv/server/foo/bar"},
|
|
- {"/srv/server", "/foo/bar", "/srv/server/foo/bar"},
|
|
- {"/srv/server", "foo/../bar", "/srv/server/bar"},
|
|
- {"/srv/server", "../bar", "/srv/server/bar"},
|
|
- {"/srv/server", "..", "/srv/server"},
|
|
- {"/srv/server", "../..", "/srv/server"},
|
|
- {"/srv/server", "/repo/data/", "/srv/server/repo/data"},
|
|
- {"/srv/server", "/repo/data/../..", "/srv/server"},
|
|
- {"/srv/server", "/repo/data/../data/../../..", "/srv/server"},
|
|
- {"/srv/server", "/repo/data/../data/../../..", "/srv/server"},
|
|
+ {"/", []string{"foo", "bar"}, "/foo/bar"},
|
|
+ {"/srv/server", []string{"foo", "bar"}, "/srv/server/foo/bar"},
|
|
+ {"/srv/server", []string{"foo", "..", "bar"}, "/srv/server/foo/bar"},
|
|
+ {"/srv/server", []string{"..", "bar"}, "/srv/server/bar"},
|
|
+ {"/srv/server", []string{".."}, "/srv/server"},
|
|
+ {"/srv/server", []string{"..", ".."}, "/srv/server"},
|
|
+ {"/srv/server", []string{"repo", "data"}, "/srv/server/repo/data"},
|
|
+ {"/srv/server", []string{"repo", "data", "..", ".."}, "/srv/server/repo/data"},
|
|
+ {"/srv/server", []string{"repo", "data", "..", "data", "..", "..", ".."}, "/srv/server/repo/data/data"},
|
|
}
|
|
|
|
for _, test := range tests {
|
|
t.Run("", func(t *testing.T) {
|
|
- got, err := join(filepath.FromSlash(test.base), test.name)
|
|
+ got, err := join(filepath.FromSlash(test.base), test.names...)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|