Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-workhorse
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-workhorse
Commits
da67743e
Commit
da67743e
authored
Jun 10, 2016
by
Z.J. van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Test the format-patch serving
Also a forgotten diff is now renamed to patch
parent
c42b7dd4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
1 deletion
+46
-1
internal/git/format-patch.go
internal/git/format-patch.go
+1
-1
main_test.go
main_test.go
+45
-0
No files found.
internal/git/format-patch.go
View file @
da67743e
...
...
@@ -17,7 +17,7 @@ type patchParams struct {
ShaTo
string
}
var
SendPatch
=
&
diff
{
"git-format-patch:"
}
var
SendPatch
=
&
patch
{
"git-format-patch:"
}
func
(
p
*
patch
)
Inject
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
,
sendData
string
)
{
var
params
patchParams
...
...
main_test.go
View file @
da67743e
...
...
@@ -665,6 +665,51 @@ func TestGetGitDiff(t *testing.T) {
}
}
func
TestGetGitPatch
(
t
*
testing
.
T
)
{
fromSha
:=
"be93687618e4b132087f430a4d8fc3a609c9b77c"
toSha
:=
"54fcc214b94e78d7a41a9a8fe6d87a5e59500e51"
headerKey
:=
http
.
CanonicalHeaderKey
(
"Gitlab-Workhorse-Send-Data"
)
ts
:=
testhelper
.
TestServerWithHandler
(
regexp
.
MustCompile
(
`.`
),
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
responseJSON
:=
fmt
.
Sprintf
(
`{"RepoPath":"%s","ShaFrom":"%s","ShaTo":"%s"}`
,
path
.
Join
(
testRepoRoot
,
testRepo
),
fromSha
,
toSha
)
encodedJSON
:=
base64
.
StdEncoding
.
EncodeToString
([]
byte
(
responseJSON
))
w
.
Header
()
.
Set
(
headerKey
,
"git-format-patch:"
+
encodedJSON
)
return
})
defer
ts
.
Close
()
ws
:=
startWorkhorseServer
(
ts
.
URL
)
defer
ws
.
Close
()
resourcePath
:=
"/something"
resp
,
err
:=
http
.
Get
(
ws
.
URL
+
resourcePath
)
if
err
!=
nil
{
t
.
Error
(
err
)
}
defer
resp
.
Body
.
Close
()
if
resp
.
StatusCode
!=
200
{
t
.
Errorf
(
"GET %q: expected 200, got %d"
,
resourcePath
,
resp
.
StatusCode
)
}
if
len
(
resp
.
Header
[
headerKey
])
!=
0
{
t
.
Fatalf
(
"Unexpected response header: %s: %q"
,
headerKey
,
resp
.
Header
.
Get
(
headerKey
))
}
body
,
err
:=
ioutil
.
ReadAll
(
resp
.
Body
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
if
!
strings
.
HasPrefix
(
string
(
body
),
"From 54fcc214b94e78d7a41a9a8fe6d87a5e59500e51 Mon Sep 17 00:00:00 2001"
)
{
t
.
Fatalf
(
"Expected: From 54fcc214b94e78d7a41a9a8fe6d87a5e59500e51 Mon Sep 17 00:00:00 2001, got: %v"
,
body
)
}
bodyLengthBytes
:=
len
(
body
)
if
bodyLengthBytes
!=
449
{
t
.
Fatal
(
"Expected the body to consist of 449 bytes, got %v"
,
bodyLengthBytes
)
}
}
func
setupStaticFile
(
fpath
,
content
string
)
error
{
cwd
,
err
:=
os
.
Getwd
()
if
err
!=
nil
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment