aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
author6543 <6543@obermui.de>2021-04-11 17:45:29 +0200
committerGitHub <noreply@github.com>2021-04-11 11:45:29 -0400
commit83d771c1c73a779e6aa8dda0a1163be1b18f1318 (patch)
tree7c0ab0ffa0677401f93a7fef4f34e538608f2c19 /modules
parent8171478d1d692de9a10f22392e1d166fd7f0e332 (diff)
downloadgitea-83d771c1c73a779e6aa8dda0a1163be1b18f1318.tar.gz
gitea-83d771c1c73a779e6aa8dda0a1163be1b18f1318.zip
use repo1_bare to test against (#15402)
Diffstat (limited to 'modules')
-rw-r--r--modules/git/blob_test.go37
1 files changed, 11 insertions, 26 deletions
diff --git a/modules/git/blob_test.go b/modules/git/blob_test.go
index 9043de5955..d02251ed90 100644
--- a/modules/git/blob_test.go
+++ b/modules/git/blob_test.go
@@ -7,6 +7,7 @@ package git
import (
"io/ioutil"
+ "path/filepath"
"testing"
"github.com/stretchr/testify/assert"
@@ -14,32 +15,15 @@ import (
)
func TestBlob_Data(t *testing.T) {
- output := `Copyright (c) 2016 The Gitea Authors
-Copyright (c) 2015 The Gogs Authors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-`
- repo, err := OpenRepository("../../.git")
- assert.NoError(t, err)
+ output := "file2\n"
+ bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
+ repo, err := OpenRepository(bareRepo1Path)
+ if !assert.NoError(t, err) {
+ t.Fatal()
+ }
defer repo.Close()
- testBlob, err := repo.GetBlob("a8d4b49dd073a4a38a7e58385eeff7cc52568697")
+ testBlob, err := repo.GetBlob("6c493ff740f9380390d5c9ddef4af18697ac9375")
assert.NoError(t, err)
r, err := testBlob.DataAsync()
@@ -53,13 +37,14 @@ THE SOFTWARE.
}
func Benchmark_Blob_Data(b *testing.B) {
- repo, err := OpenRepository("../../.git")
+ bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
+ repo, err := OpenRepository(bareRepo1Path)
if err != nil {
b.Fatal(err)
}
defer repo.Close()
- testBlob, err := repo.GetBlob("a8d4b49dd073a4a38a7e58385eeff7cc52568697")
+ testBlob, err := repo.GetBlob("6c493ff740f9380390d5c9ddef4af18697ac9375")
if err != nil {
b.Fatal(err)
}