aboutsummaryrefslogtreecommitdiff
path: root/network/protocol/v0v1/server/receivepack
diff options
context:
space:
mode:
Diffstat (limited to 'network/protocol/v0v1/server/receivepack')
-rw-r--r--network/protocol/v0v1/server/receivepack/parse_test.go20
-rw-r--r--network/protocol/v0v1/server/receivepack/report_status.go8
-rw-r--r--network/protocol/v0v1/server/receivepack/report_status_test.go8
3 files changed, 18 insertions, 18 deletions
diff --git a/network/protocol/v0v1/server/receivepack/parse_test.go b/network/protocol/v0v1/server/receivepack/parse_test.go
index 7c7cbe3b..3a891d3e 100644
--- a/network/protocol/v0v1/server/receivepack/parse_test.go
+++ b/network/protocol/v0v1/server/receivepack/parse_test.go
@@ -40,9 +40,9 @@ func TestReadRequestParsesCommandsAndPushOptions(t *testing.T) {
t.Fatalf("WriteData(second): %v", err)
}
- err = enc.WriteFlush()
+ err = enc.WriteFlushPacket()
if err != nil {
- t.Fatalf("WriteFlush(commands): %v", err)
+ t.Fatalf("WriteFlushPacket(commands): %v", err)
}
err = enc.WriteData([]byte("ci.skip\n"))
@@ -50,9 +50,9 @@ func TestReadRequestParsesCommandsAndPushOptions(t *testing.T) {
t.Fatalf("WriteData(push-option): %v", err)
}
- err = enc.WriteFlush()
+ err = enc.WriteFlushPacket()
if err != nil {
- t.Fatalf("WriteFlush(push-options): %v", err)
+ t.Fatalf("WriteFlushPacket(push-options): %v", err)
}
base := common.NewSession(strings.NewReader(wire.String()), &bufferWriteFlusher{}, common.Options{
@@ -111,9 +111,9 @@ func TestReadRequestDeleteOnlyDoesNotExpectPack(t *testing.T) {
t.Fatalf("WriteData: %v", err)
}
- err = enc.WriteFlush()
+ err = enc.WriteFlushPacket()
if err != nil {
- t.Fatalf("WriteFlush: %v", err)
+ t.Fatalf("WriteFlushPacket: %v", err)
}
base := common.NewSession(strings.NewReader(wire.String()), &bufferWriteFlusher{}, common.Options{
@@ -159,9 +159,9 @@ func TestReadRequestRejectsUnsupportedCapability(t *testing.T) {
t.Fatalf("WriteData: %v", err)
}
- err = enc.WriteFlush()
+ err = enc.WriteFlushPacket()
if err != nil {
- t.Fatalf("WriteFlush: %v", err)
+ t.Fatalf("WriteFlushPacket: %v", err)
}
base := common.NewSession(strings.NewReader(wire.String()), &bufferWriteFlusher{}, common.Options{
@@ -222,9 +222,9 @@ func TestReadRequestParsesPushCertificate(t *testing.T) {
}
}
- err = enc.WriteFlush()
+ err = enc.WriteFlushPacket()
if err != nil {
- t.Fatalf("WriteFlush: %v", err)
+ t.Fatalf("WriteFlushPacket: %v", err)
}
base := common.NewSession(strings.NewReader(wire.String()), &bufferWriteFlusher{}, common.Options{
diff --git a/network/protocol/v0v1/server/receivepack/report_status.go b/network/protocol/v0v1/server/receivepack/report_status.go
index fbe4fb4f..d852a161 100644
--- a/network/protocol/v0v1/server/receivepack/report_status.go
+++ b/network/protocol/v0v1/server/receivepack/report_status.go
@@ -31,7 +31,7 @@ func (session *Session) WriteReportStatus(result ReportStatusResult) error {
}
}
- return session.base.WriteFlush()
+ return session.base.WriteFlushPacket()
}
buf, err := pktline.AppendData(nil, fmt.Appendf(nil, "unpack %s\n", unpackResult))
@@ -60,7 +60,7 @@ func (session *Session) WriteReportStatus(result ReportStatusResult) error {
return err
}
- return session.base.WriteFlush()
+ return session.base.WriteFlushPacket()
}
// WriteReportStatusV2 writes one report-status-v2 response.
@@ -120,7 +120,7 @@ func (session *Session) WriteReportStatusV2(result ReportStatusResult) error {
}
}
- return session.base.WriteFlush()
+ return session.base.WriteFlushPacket()
}
buf, err := pktline.AppendData(nil, fmt.Appendf(nil, "unpack %s\n", unpackResult))
@@ -181,5 +181,5 @@ func (session *Session) WriteReportStatusV2(result ReportStatusResult) error {
return err
}
- return session.base.WriteFlush()
+ return session.base.WriteFlushPacket()
}
diff --git a/network/protocol/v0v1/server/receivepack/report_status_test.go b/network/protocol/v0v1/server/receivepack/report_status_test.go
index b9b116f6..697311de 100644
--- a/network/protocol/v0v1/server/receivepack/report_status_test.go
+++ b/network/protocol/v0v1/server/receivepack/report_status_test.go
@@ -65,9 +65,9 @@ func TestWriteReportStatusUsesSideBand64KWhenNegotiated(t *testing.T) {
t.Fatalf("WriteData(request): %v", err)
}
- err = requestEnc.WriteFlush()
+ err = requestEnc.WriteFlushPacket()
if err != nil {
- t.Fatalf("WriteFlush(request): %v", err)
+ t.Fatalf("WriteFlushPacket(request): %v", err)
}
var out bufferWriteFlusher
@@ -249,9 +249,9 @@ func TestProgressWriterUsesSideBand64KWhenNegotiated(t *testing.T) {
t.Fatalf("WriteData(request): %v", err)
}
- err = requestEnc.WriteFlush()
+ err = requestEnc.WriteFlushPacket()
if err != nil {
- t.Fatalf("WriteFlush(request): %v", err)
+ t.Fatalf("WriteFlushPacket(request): %v", err)
}
var out bufferWriteFlusher