working commit

2026-02-14 13:14:47 +02:00
parent 7790b70372
commit 4a779007b5
8 changed files with 100 additions and 39 deletions
@@ -1,126 +0,0 @@
-/*
- * Copyright 2026 Oleg Borodin <onborodin@gmail.com>
- *
- * This work is published and licensed under a Creative Commons
- * Attribution-NonCommercial-NoDerivatives 4.0 International License.
- *
- * Distribution of this work is permitted, but commercial use and
- * modifications are strictly prohibited.
- */
-package client
-
-import (
-	"context"
-	"fmt"
-	"sync"
-	"testing"
-	"time"
-
-	"mstore/app/server"
-
-	"github.com/stretchr/testify/require"
-	"sigs.k8s.io/yaml"
-)
-
-func TestAccountLife(t *testing.T) {
-	var srvport int64 = 10250
-	srvdir := t.TempDir()
-	srvaddr := fmt.Sprintf("foouser:foopass@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()
-		helloRes, err := cli.ServiceHello(ctx, srvaddr+"/hello", 1*time.Second)
-		require.NoError(t, err)
-		require.True(t, helloRes)
-	}
-
-	username := "testuser"
-	password := "testpass"
-
-	var accountID string
-	{
-		// CreateAccount
-		fmt.Printf("=== CreateAccount ===\n")
-		cli := NewClient()
-		ctx := context.Background()
-		ctx, _ = context.WithTimeout(ctx, 1*time.Second)
-
-		accountID, err = cli.CreateAccount(ctx, srvaddr, username, password)
-		require.NoError(t, err)
-	}
-	{
-		// GetAccount
-		fmt.Printf("=== GetAccount ===\n")
-		cli := NewClient()
-		ctx := context.Background()
-		ctx, _ = context.WithTimeout(ctx, 1*time.Second)
-
-		accountDescr, err := cli.GetAccountByID(ctx, srvaddr, accountID)
-		require.NoError(t, err)
-		accountYAML, err := yaml.Marshal(accountDescr)
-		fmt.Printf("account:\n%s\n", string(accountYAML))
-	}
-	{
-		// ListAccounts
-		fmt.Printf("=== ListAccounts ===\n")
-		cli := NewClient()
-		ctx := context.Background()
-		ctx, _ = context.WithTimeout(ctx, 1*time.Second)
-
-		accountDescrs, err := cli.ListAccounts(ctx, srvaddr+"/")
-		require.NoError(t, err)
-		require.NotZero(t, len(accountDescrs))
-		accountsYAML, err := yaml.Marshal(accountDescrs)
-		fmt.Printf("accounts:\n%s\n", string(accountsYAML))
-
-	}
-	{
-		// DeleteAccount
-		fmt.Printf("=== DeleteAccount ===\n")
-		cli := NewClient()
-		ctx := context.Background()
-		ctx, _ = context.WithTimeout(ctx, 1*time.Second)
-
-		err = cli.DeleteAccountByID(ctx, srvaddr, accountID)
-		require.NoError(t, err)
-	}
-
-}
@@ -1,159 +0,0 @@
-/*
- * Copyright 2026 Oleg Borodin <onborodin@gmail.com>
- *
- * This work is published and licensed under a Creative Commons
- * Attribution-NonCommercial-NoDerivatives 4.0 International License.
- *
- * Distribution of this work is permitted, but commercial use and
- * modifications are strictly prohibited.
- */
-package client
-
-import (
-	"context"
-	"fmt"
-	"math/rand"
-	"os"
-	"path/filepath"
-	"sync"
-	"testing"
-	"time"
-
-	"mstore/app/server"
-
-	"github.com/stretchr/testify/require"
-)
-
-func xxxTestFileLife(t *testing.T) {
-	var srvport int64 = 10250
-	srvdir := t.TempDir()
-	srvaddr := fmt.Sprintf("testuser:testpass@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()
-		helloRes, err := cli.ServiceHello(ctx, srvaddr+"/hello", 1*time.Second)
-		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)
-	}
-	{
-		// FileInfo
-		fmt.Printf("=== FileInfo ===\n")
-		cli := NewClient()
-		ctx := context.Background()
-		ctx, _ = context.WithTimeout(ctx, 1*time.Second)
-
-		exists, file, err := cli.FileInfo(ctx, srvaddr+"/foo.bin")
-		require.NoError(t, err)
-		require.True(t, exists)
-		require.NotNil(t, file)
-	}
-	{
-		// 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))
-	}
-	{
-		// ListFiles
-		fmt.Printf("=== ListFiles ===\n")
-		cli := NewClient()
-		ctx := context.Background()
-		ctx, _ = context.WithTimeout(ctx, 1*time.Second)
-
-		files, err := cli.ListFiles(ctx, srvaddr+"/")
-		require.NoError(t, err)
-		require.NotZero(t, len(files))
-	}
-
-	{
-		// DeleteFile
-		fmt.Printf("=== DeleteFile ===\n")
-		cli := NewClient()
-		ctx := context.Background()
-		ctx, _ = context.WithTimeout(ctx, 1*time.Second)
-
-		err = cli.DeleteFile(ctx, srvaddr+"/foo.bin")
-		require.NoError(t, err)
-	}
-	{
-		// !FileInfo
-		fmt.Printf("=== FileInfo ===\n")
-		cli := NewClient()
-		ctx := context.Background()
-		ctx, _ = context.WithTimeout(ctx, 1*time.Second)
-
-		exists, _, err := cli.FileInfo(ctx, srvaddr+"/foo.bin")
-		require.NoError(t, err)
-		require.False(t, exists)
-
-	}
-
-}
@@ -1,96 +0,0 @@
-/*
- * Copyright 2026 Oleg Borodin <onborodin@gmail.com>
- *
- * This work is published and licensed under a Creative Commons
- * Attribution-NonCommercial-NoDerivatives 4.0 International License.
- *
- * Distribution of this work is permitted, but commercial use and
- * modifications are strictly prohibited.
- */
-package client
-
-import (
-	"context"
-	"fmt"
-	"sync"
-	"testing"
-	"time"
-
-	"mstore/app/server"
-
-	"github.com/stretchr/testify/require"
-	"sigs.k8s.io/yaml"
-)
-
-func xxxTestImageLife(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)
-		if false {
-			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() {
-			time.Sleep(5 * time.Second)
-			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()
-		helloRes, err := cli.ServiceHello(ctx, srvaddr+"/hello", 1*time.Second)
-		require.NoError(t, err)
-		require.True(t, helloRes)
-	}
-	{
-		// PishImage
-		fmt.Printf("=== PushImage ===\n")
-		cli := NewClient()
-		ctx, _ := context.WithTimeout(context.Background(), 1*time.Second)
-		err := cli.PushImage(ctx, "test-oci.img", srvaddr+"/foo/test:123")
-		require.NoError(t, err)
-	}
-	{
-		// ImageInfo
-		fmt.Printf("=== ImageInfo ===\n")
-		cli := NewClient()
-		ctx, _ := context.WithTimeout(context.Background(), 1*time.Second)
-		info, err := cli.ImageInfo(ctx, srvaddr+"/foo/test:123")
-		require.NoError(t, err)
-		infoYaml, err := yaml.Marshal(info)
-		require.NoError(t, err)
-		fmt.Printf("imageInfo:\n%s\n", string(infoYaml))
-	}
-
-}