Skip to content

Commit 92ffded

Browse files
committed
Added tests
1 parent 0ae98b5 commit 92ffded

File tree

3 files changed

+88
-2
lines changed

3 files changed

+88
-2
lines changed

modules/git/repo_compare_test.go

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"bytes"
99
"io"
1010
"path/filepath"
11+
"strings"
1112
"testing"
1213

1314
"code.gitea.io/gitea/modules/util"
@@ -18,11 +19,11 @@ import (
1819
func TestGetFormatPatch(t *testing.T) {
1920
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
2021
clonedPath, err := cloneRepo(bareRepo1Path, testReposDir, "repo1_TestGetFormatPatch")
21-
assert.NoError(t, err)
2222
defer util.RemoveAll(clonedPath)
23-
repo, err := OpenRepository(clonedPath)
2423
assert.NoError(t, err)
24+
repo, err := OpenRepository(clonedPath)
2525
defer repo.Close()
26+
assert.NoError(t, err)
2627
rd := &bytes.Buffer{}
2728
err = repo.GetPatch("8d92fc95^", "8d92fc95", rd)
2829
assert.NoError(t, err)
@@ -32,3 +33,49 @@ func TestGetFormatPatch(t *testing.T) {
3233
assert.Regexp(t, "^From 8d92fc95", patch)
3334
assert.Contains(t, patch, "Subject: [PATCH] Add file2.txt")
3435
}
36+
37+
func TestReadPatch(t *testing.T) {
38+
// Ensure we can read the patch files
39+
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
40+
repo, err := OpenRepository(bareRepo1Path)
41+
defer repo.Close()
42+
assert.NoError(t, err)
43+
// This patch doesn't exist
44+
noFile, err := repo.ReadPatchCommit(0)
45+
assert.Error(t, err)
46+
// This patch is an empty one (sometimes it's a 404)
47+
noCommit, err := repo.ReadPatchCommit(1)
48+
assert.Error(t, err)
49+
// This patch is legit and should return a commit
50+
oldCommit, err := repo.ReadPatchCommit(2)
51+
assert.NoError(t, err)
52+
53+
assert.Empty(t, noFile)
54+
assert.Empty(t, noCommit)
55+
assert.Len(t, oldCommit, 40)
56+
assert.True(t, oldCommit == "6e8e2a6f9efd71dbe6917816343ed8415ad696c3")
57+
}
58+
59+
func TestReadWritePullHead(t *testing.T) {
60+
// Ensure we can write SHA1 head corresponding to PR and open them
61+
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
62+
repo, err := OpenRepository(bareRepo1Path)
63+
assert.NoError(t, err)
64+
defer repo.Close()
65+
// Try to open non-existing Pull
66+
_, err = repo.ReadPullHead(0)
67+
assert.Error(t, err)
68+
// Write a fake sha1 with only 40 zeros
69+
newCommit := strings.Repeat("0", 40)
70+
err = repo.WritePullHead(1, newCommit)
71+
assert.NoError(t, err)
72+
headFile := filepath.Join(repo.Path, "refs/pull/1/head")
73+
// Remove file after the test
74+
defer util.Remove(headFile)
75+
assert.FileExists(t, headFile)
76+
// Read the file created
77+
headContents, err := repo.ReadPullHead(1)
78+
assert.NoError(t, err)
79+
assert.Len(t, string(headContents), 40)
80+
assert.True(t, string(headContents) == newCommit)
81+
}

modules/git/tests/repos/repo1_bare/pulls/1.patch

Whitespace-only changes.
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
From 6e8e2a6f9efd71dbe6917816343ed8415ad696c3 Mon Sep 17 00:00:00 2001
2+
From: 99rgosse <[email protected]>
3+
Date: Fri, 26 Mar 2021 12:44:22 +0000
4+
Subject: [PATCH] Update gitea_import_actions.py
5+
6+
---
7+
gitea_import_actions.py | 6 +++---
8+
1 file changed, 3 insertions(+), 3 deletions(-)
9+
10+
diff --git a/gitea_import_actions.py b/gitea_import_actions.py
11+
index f0d72cd..7b31963 100644
12+
--- a/gitea_import_actions.py
13+
+++ b/gitea_import_actions.py
14+
@@ -3,14 +3,14 @@
15+
# git log --pretty=format:'%H,%at,%s' --date=default > /tmp/commit.log
16+
# to get the commits logfile for a repository
17+
18+
-import mysql.connector as mariadb
19+
+import psycopg2
20+
21+
# set the following variables to fit your need...
22+
USERID = 1
23+
REPOID = 1
24+
BRANCH = "master"
25+
26+
-mydb = mariadb.connect(
27+
+mydb = psycopg2.connect(
28+
host="localhost",
29+
user="user",
30+
passwd="password",
31+
@@ -31,4 +31,4 @@ with open("/tmp/commit.log") as f:
32+
33+
mydb.commit()
34+
35+
-print("actions inserted.")
36+
\ No newline at end of file
37+
+print("actions inserted.")
38+
--
39+
GitLab

0 commit comments

Comments
 (0)