[gentoo-commits] repo/gentoo:master commit in: net-misc/croc/files/

[gentoo-commits] repo/gentoo:master commit in: net-misc/croc/files/

[Stephan Hartmann]

commit:     d2e3116a86f6e1b99d5ec421b3717ed37a95cc7b
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat May 15 15:44:25 2021 +0000
Commit:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Sat May 15 18:02:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2e3116a

net-misc/croc: remove unused patch

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/20822
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>

 .../croc/files/croc-disable-network-tests.patch    | 33 ----------------------
 1 file changed, 33 deletions(-)

diff --git a/net-misc/croc/files/croc-disable-network-tests.patch b/net-misc/croc/files/croc-disable-network-tests.patch
deleted file mode 100644
index 92a3a620b96..00000000000
--- a/net-misc/croc/files/croc-disable-network-tests.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Disable tests that fail with network-sandbox
-
-index 101162e..5be096e 100644
---- a/src/utils/utils_test.go
-+++ b/src/utils/utils_test.go
-@@ -7,7 +7,6 @@ import (
- 	"log"
- 	"math/rand"
- 	"os"
--	"strings"
- 	"testing"
- 
- 	"github.com/stretchr/testify/assert"
-@@ -169,19 +168,6 @@ func TestHashFile(t *testing.T) {
- 	assert.Equal(t, "18c9673a4bb8325d323e7f24fda9ae1e", fmt.Sprintf("%x", hashed))
- }
- 
--func TestPublicIP(t *testing.T) {
--	ip, err := PublicIP()
--	fmt.Println(ip)
--	assert.True(t, strings.Contains(ip, ".") || strings.Contains(ip, ":"))
--	assert.Nil(t, err)
--}
--
--func TestLocalIP(t *testing.T) {
--	ip := LocalIP()
--	fmt.Println(ip)
--	assert.True(t, strings.Contains(ip, ".") || strings.Contains(ip, ":"))
--}
--
- func TestGetRandomName(t *testing.T) {
- 	name := GetRandomName()
- 	assert.NotEmpty(t, name)

[gentoo-commits] repo/gentoo:master commit in: net-misc/croc/files/

[Stephan Hartmann]

commit:     bb87817a66e82c45bee3b0fae643046a50bff975
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Feb  8 17:15:49 2022 +0000
Commit:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Tue Feb  8 18:15:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb87817a

net-misc/croc: remove unused patch

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/24131
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>

 net-misc/croc/files/croc-9.4.2-tcp-const.patch | 49 --------------------------
 1 file changed, 49 deletions(-)

diff --git a/net-misc/croc/files/croc-9.4.2-tcp-const.patch b/net-misc/croc/files/croc-9.4.2-tcp-const.patch
deleted file mode 100644
index bcd6823983b9..000000000000
--- a/net-misc/croc/files/croc-9.4.2-tcp-const.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 2ffb20201c00a4de9c8082c909e2428c2b46d5c2 Mon Sep 17 00:00:00 2001
-From: jolheiser <john.olheiser@gmail.com>
-Date: Sun, 3 Oct 2021 16:23:29 -0500
-Subject: [PATCH] Fix TCP constant
-
-Signed-off-by: jolheiser <john.olheiser@gmail.com>
----
- src/tcp/tcp.go      | 7 +++----
- src/tcp/tcp_test.go | 4 ++--
- 2 files changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/src/tcp/tcp.go b/src/tcp/tcp.go
-index 2714e5f1..d271756b 100644
---- a/src/tcp/tcp.go
-+++ b/src/tcp/tcp.go
-@@ -37,10 +37,9 @@ type roomMap struct {
- 	sync.Mutex
- }
- 
--const (
--	timeToRoomDeletion = 10 * time.Minute
--	pingRoom           = "pinglkasjdlfjsaldjf"
--)
-+const pingRoom = "pinglkasjdlfjsaldjf"
-+
-+var timeToRoomDeletion = 10 * time.Minute
- 
- // Run starts a tcp listener, run async
- func Run(debugLevel, host, port, password string, banner ...string) (err error) {
-diff --git a/src/tcp/tcp_test.go b/src/tcp/tcp_test.go
-index 165f9537..6ba99677 100644
---- a/src/tcp/tcp_test.go
-+++ b/src/tcp/tcp_test.go
-@@ -25,13 +25,13 @@ func TestTCP(t *testing.T) {
- 	log.SetLevel("error")
- 	timeToRoomDeletion = 100 * time.Millisecond
- 	go Run("debug", "localhost", "8281", "pass123", "8282")
--	time.Sleep(100 * time.Millisecond)
-+	time.Sleep(timeToRoomDeletion)
- 	err := PingServer("localhost:8281")
- 	assert.Nil(t, err)
- 	err = PingServer("localhost:8333")
- 	assert.NotNil(t, err)
- 
--	time.Sleep(100 * time.Millisecond)
-+	time.Sleep(timeToRoomDeletion)
- 	c1, banner, _, err := ConnectToTCPServer("localhost:8281", "pass123", "testRoom", 1*time.Minute)
- 	assert.Equal(t, banner, "8282")
- 	assert.Nil(t, err)