working commit

2026-02-03 11:54:34 +02:00
parent 5cd8797e33
commit fe0a3afcdd
10 changed files with 56 additions and 171 deletions
@@ -9,6 +9,7 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
+	"time"
 )

 type Client struct {
@@ -27,10 +28,12 @@ func NewClientWithAuth(username, password string) *Client {
 	}
 }

-func (cli *Client) ServiceHello(ctx context.Context, ref string) (bool, error) {
+func (cli *Client) ServiceHello(ctx context.Context, ref string, timeout time.Duration) (bool, error) {
 	var res bool
 	var err error

+	ctx, _ = context.WithTimeout(ctx, timeout)
+
 	ref, err = convertServiceRefer(ref)
 	if err != nil {
 		return res, err
@@ -1,140 +0,0 @@
-package client
-
-import (
-	"context"
-	"fmt"
-	"math/rand"
-	"os"
-	"path/filepath"
-	"sync"
-	"testing"
-	"time"
-
-	"mstore/app/server"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestService(t *testing.T) {
-	var srvport int64 = 10250
-	srvdir := t.TempDir()
-	srvaddr := fmt.Sprintf("127.0.0.1:%d", srvport)
-
-	srv, err := server.NewServer()
-	require.NoError(t, err)
-	{
-		err = srv.Configure()
-		require.NoError(t, err)
-
-		srv.SetDatadir(srvdir)
-		srv.SetLogdir(srvdir)
-		srv.SetRundir(srvdir)
-		srv.SetPort(srvport)
-
-		err = srv.Build()
-		require.NoError(t, err)
-
-		var svcWG sync.WaitGroup
-		errPipe := make(chan error, 5)
-
-		startFunc := func() {
-			err := srv.Service().Run()
-			errPipe <- err
-			svcWG.Done()
-		}
-
-		stopFunc := func() {
-			srv.Service().Stop()
-			svcWG.Wait()
-			err = <-errPipe
-			require.NoError(t, err)
-		}
-		defer stopFunc()
-
-		svcWG.Add(1)
-		go startFunc()
-		time.Sleep(1 * time.Second)
-	}
-	{
-		// ServiceHello
-		fmt.Printf("=== ServiceHello ===\n")
-		cli := NewClient()
-		ctx := context.Background()
-		ctx, _ = context.WithTimeout(ctx, 1*time.Second)
-
-		helloRes, err := cli.ServiceHello(ctx, srvaddr+"/hello")
-		require.NoError(t, err)
-		require.True(t, helloRes)
-	}
-	filesize := 32
-	{
-		// PutFile
-		tmpdir := t.TempDir()
-		tmpfile := filepath.Join(tmpdir, "foo.bin")
-
-		filedata := make([]byte, filesize)
-		_, err = rand.Read(filedata)
-		require.NoError(t, err)
-
-		err := os.WriteFile(tmpfile, filedata, 0666)
-		require.NoError(t, err)
-
-		fmt.Printf("=== PutFile ===\n")
-		cli := NewClient()
-		ctx := context.Background()
-		ctx, _ = context.WithTimeout(ctx, 1*time.Second)
-
-		err = cli.PutFile(ctx, tmpfile, srvaddr+"/foo.bin")
-		require.NoError(t, err)
-	}
-	{
-		// FileExists
-		fmt.Printf("=== FileExists ===\n")
-		cli := NewClient()
-		ctx := context.Background()
-		ctx, _ = context.WithTimeout(ctx, 1*time.Second)
-
-		exists, err := cli.FileExists(ctx, srvaddr+"/foo.bin")
-		require.NoError(t, err)
-		require.True(t, exists)
-	}
-	{
-		// GetFile
-		fmt.Printf("=== GetFile ===\n")
-		cli := NewClient()
-		ctx := context.Background()
-		ctx, _ = context.WithTimeout(ctx, 1*time.Second)
-
-		tmpdir := t.TempDir()
-		tmpfile := filepath.Join(tmpdir, "foo.bin")
-
-		recsize, err := cli.GetFile(ctx, srvaddr+"/foo.bin", tmpfile)
-		require.NoError(t, err)
-		require.Equal(t, recsize, int64(filesize))
-	}
-	{
-		// DeleteFile
-		fmt.Printf("=== DeleteFile ===\n")
-		cli := NewClient()
-		ctx := context.Background()
-		ctx, _ = context.WithTimeout(ctx, 1*time.Second)
-
-		tmpdir := t.TempDir()
-		tmpfile := filepath.Join(tmpdir, "foo.bin")
-
-		err = cli.DeleteFile(ctx, srvaddr+"/foo.bin", tmpfile)
-		require.NoError(t, err)
-	}
-	{
-		// !FileExists
-		fmt.Printf("=== FileExists ===\n")
-		cli := NewClient()
-		ctx := context.Background()
-		ctx, _ = context.WithTimeout(ctx, 1*time.Second)
-
-		exists, err := cli.FileExists(ctx, srvaddr+"/foo.bin")
-		require.NoError(t, err)
-		require.False(t, exists)
-	}
-
-}