From 6ffbc0a2b8e1e2edd2bce59a1d2ac357f9004de8 Mon Sep 17 00:00:00 2001 From: "Allen.M" Date: Wed, 30 Sep 2020 15:50:40 +0800 Subject: [PATCH] testing: fix temporary create failed on Windows We are creating temporary files on the root directory of beego now This PR using system temporary directory for testing. Fixes #4243 --- controller_test.go | 4 ++-- template_test.go | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/controller_test.go b/controller_test.go index 1e53416d..215a7411 100644 --- a/controller_test.go +++ b/controller_test.go @@ -125,8 +125,8 @@ func TestGetUint64(t *testing.T) { } func TestAdditionalViewPaths(t *testing.T) { - dir1 := "_beeTmp" - dir2 := "_beeTmp2" + dir1 := tmpDir("TestAdditionalViewPaths1") + dir2 := tmpDir("TestAdditionalViewPaths2") defer os.RemoveAll(dir1) defer os.RemoveAll(dir2) diff --git a/template_test.go b/template_test.go index 287faadc..049655db 100644 --- a/template_test.go +++ b/template_test.go @@ -45,8 +45,12 @@ var block = `{{define "block"}}

Hello, blocks!

{{end}}` +func tmpDir(s string) string { + return filepath.Join(os.TempDir(), s) +} + func TestTemplate(t *testing.T) { - dir := "_beeTmp" + dir := tmpDir("TestTemplate") files := []string{ "header.tpl", "index.tpl", @@ -107,7 +111,7 @@ var user = ` ` func TestRelativeTemplate(t *testing.T) { - dir := "_beeTmp" + dir := tmpDir("TestRelativeTemplate") //Just add dir to known viewPaths if err := AddViewPath(dir); err != nil { @@ -218,7 +222,7 @@ var output = ` ` func TestTemplateLayout(t *testing.T) { - dir := "_beeTmp" + dir := tmpDir("TestTemplateLayout") files := []string{ "add.tpl", "layout_blog.tpl",