mirror of
https://github.com/drakkan/sftpgo.git
synced 2025-12-07 06:40:54 +03:00
osfs: add optional buffering
Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
@@ -149,7 +149,7 @@ func (fs MockOsFs) Rename(source, target string) (int, int64, error) {
|
||||
|
||||
func newMockOsFs(err, statErr error, atomicUpload bool, connectionID, rootDir string) vfs.Fs {
|
||||
return &MockOsFs{
|
||||
Fs: vfs.NewOsFs(connectionID, rootDir, ""),
|
||||
Fs: vfs.NewOsFs(connectionID, rootDir, "", nil),
|
||||
err: err,
|
||||
statErr: statErr,
|
||||
isAtomicUploadSupported: atomicUpload,
|
||||
@@ -183,7 +183,7 @@ func TestUploadResumeInvalidOffset(t *testing.T) {
|
||||
Username: "testuser",
|
||||
},
|
||||
}
|
||||
fs := vfs.NewOsFs("", os.TempDir(), "")
|
||||
fs := vfs.NewOsFs("", os.TempDir(), "", nil)
|
||||
conn := common.NewBaseConnection("", common.ProtocolSFTP, "", "", user)
|
||||
baseTransfer := common.NewBaseTransfer(file, conn, nil, file.Name(), file.Name(), testfile,
|
||||
common.TransferUpload, 10, 0, 0, 0, false, fs, dataprovider.TransferQuota{})
|
||||
@@ -214,7 +214,7 @@ func TestReadWriteErrors(t *testing.T) {
|
||||
Username: "testuser",
|
||||
},
|
||||
}
|
||||
fs := vfs.NewOsFs("", os.TempDir(), "")
|
||||
fs := vfs.NewOsFs("", os.TempDir(), "", nil)
|
||||
conn := common.NewBaseConnection("", common.ProtocolSFTP, "", "", user)
|
||||
baseTransfer := common.NewBaseTransfer(file, conn, nil, file.Name(), file.Name(), testfile, common.TransferDownload,
|
||||
0, 0, 0, 0, false, fs, dataprovider.TransferQuota{})
|
||||
@@ -288,7 +288,7 @@ func TestTransferCancelFn(t *testing.T) {
|
||||
Username: "testuser",
|
||||
},
|
||||
}
|
||||
fs := vfs.NewOsFs("", os.TempDir(), "")
|
||||
fs := vfs.NewOsFs("", os.TempDir(), "", nil)
|
||||
conn := common.NewBaseConnection("", common.ProtocolSFTP, "", "", user)
|
||||
baseTransfer := common.NewBaseTransfer(file, conn, cancelFn, file.Name(), file.Name(), testfile, common.TransferDownload,
|
||||
0, 0, 0, 0, false, fs, dataprovider.TransferQuota{})
|
||||
@@ -311,7 +311,7 @@ func TestTransferCancelFn(t *testing.T) {
|
||||
|
||||
func TestUploadFiles(t *testing.T) {
|
||||
common.Config.UploadMode = common.UploadModeAtomic
|
||||
fs := vfs.NewOsFs("123", os.TempDir(), "")
|
||||
fs := vfs.NewOsFs("123", os.TempDir(), "", nil)
|
||||
u := dataprovider.User{}
|
||||
c := Connection{
|
||||
BaseConnection: common.NewBaseConnection("", common.ProtocolSFTP, "", "", u),
|
||||
@@ -1213,7 +1213,7 @@ func TestSCPParseUploadMessage(t *testing.T) {
|
||||
StdErrBuffer: bytes.NewBuffer(stdErrBuf),
|
||||
ReadError: nil,
|
||||
}
|
||||
fs := vfs.NewOsFs("", os.TempDir(), "")
|
||||
fs := vfs.NewOsFs("", os.TempDir(), "", nil)
|
||||
connection := &Connection{
|
||||
BaseConnection: common.NewBaseConnection("", common.ProtocolSFTP, "", "", dataprovider.User{
|
||||
BaseUser: sdk.BaseUser{
|
||||
@@ -1470,7 +1470,7 @@ func TestSCPRecursiveDownloadErrors(t *testing.T) {
|
||||
err := client.Close()
|
||||
assert.NoError(t, err)
|
||||
}()
|
||||
fs := vfs.NewOsFs("123", os.TempDir(), "")
|
||||
fs := vfs.NewOsFs("123", os.TempDir(), "", nil)
|
||||
connection := &Connection{
|
||||
BaseConnection: common.NewBaseConnection("", common.ProtocolSCP, "", "", dataprovider.User{
|
||||
BaseUser: sdk.BaseUser{
|
||||
@@ -1593,7 +1593,7 @@ func TestSCPDownloadFileData(t *testing.T) {
|
||||
ReadError: nil,
|
||||
WriteError: writeErr,
|
||||
}
|
||||
fs := vfs.NewOsFs("", os.TempDir(), "")
|
||||
fs := vfs.NewOsFs("", os.TempDir(), "", nil)
|
||||
connection := &Connection{
|
||||
BaseConnection: common.NewBaseConnection("", common.ProtocolSCP, "", "", dataprovider.User{BaseUser: sdk.BaseUser{HomeDir: os.TempDir()}}),
|
||||
channel: &mockSSHChannelReadErr,
|
||||
@@ -1645,7 +1645,7 @@ func TestSCPUploadFiledata(t *testing.T) {
|
||||
Username: "testuser",
|
||||
},
|
||||
}
|
||||
fs := vfs.NewOsFs("", os.TempDir(), "")
|
||||
fs := vfs.NewOsFs("", os.TempDir(), "", nil)
|
||||
connection := &Connection{
|
||||
BaseConnection: common.NewBaseConnection("", common.ProtocolSCP, "", "", user),
|
||||
channel: &mockSSHChannel,
|
||||
@@ -1736,7 +1736,7 @@ func TestUploadError(t *testing.T) {
|
||||
Username: "testuser",
|
||||
},
|
||||
}
|
||||
fs := vfs.NewOsFs("", os.TempDir(), "")
|
||||
fs := vfs.NewOsFs("", os.TempDir(), "", nil)
|
||||
connection := &Connection{
|
||||
BaseConnection: common.NewBaseConnection("", common.ProtocolSCP, "", "", user),
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user