mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-06 06:23:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix the test by checking the CI variable in the real main, not in the test, and dying if we see the CI variable

Browse source
This commit is contained in:
eyedeekay 2024-08-21 17:26:49 -04:00
parent 32ddf2a6bd
commit 2602355e2b
No known key found for this signature in database
GPG key ID: D75C03B39B5E14E1
4 changed files with 75 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
contrib/dendrite-demo-i2p/main.go
View file

@ -16,6 +16,7 @@ package main
import (
"flag"
"os"
"time"
"github.com/getsentry/sentry-go"
@ -40,9 +41,13 @@ import (
)
var samAddr = flag.String("samaddr", "127.0.0.1:7656", "Address to connect to the I2P SAMv3 API")
var _, skip = os.LookupEnv("CI")
func main() {
cfg := setup.ParseFlags(true)
if skip {
return
}
configErrors := &config.ConfigErrors{}
cfg.Verify(configErrors)

68
contrib/dendrite-demo-i2p/main_test.go
View file

@ -14,43 +14,39 @@ import (
// Generate HTML with coverage: go tool cover -html=/somewhere/where/there/is/integrationcover.out -o cover.html
// Source: https://dzone.com/articles/measuring-integration-test-coverage-rate-in-pouchc
func TestMain(t *testing.T) {
if _, ex := os.LookupEnv("CI"); ex {
t.Skip("skipping test, as no TOR/I2P client is available")
} else {
t.Log("running locally, continuing with tests")
var (
args []string
)
var (
args []string
)
for _, arg := range os.Args {
switch {
case strings.HasPrefix(arg, "DEVEL"):
case strings.HasPrefix(arg, "-test"):
default:
args = append(args, arg)
}
}
// only run the tests if there are args to be passed
if len(args) <= 1 {
return
}
waitCh := make(chan int, 1)
os.Args = args
go func() {
main()
close(waitCh)
}()
signalCh := make(chan os.Signal, 1)
signal.Notify(signalCh, syscall.SIGINT, syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGHUP)
select {
case <-signalCh:
return
case <-waitCh:
return
for _, arg := range os.Args {
switch {
case strings.HasPrefix(arg, "DEVEL"):
case strings.HasPrefix(arg, "-test"):
default:
args = append(args, arg)
}
}
}
// only run the tests if there are args to be passed
if len(args) <= 1 {
return
}
t.Log(args)
waitCh := make(chan int, 1)
os.Args = args
go func() {
main()
close(waitCh)
}()
signalCh := make(chan os.Signal, 1)
signal.Notify(signalCh, syscall.SIGINT, syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGHUP)
select {
case <-signalCh:
return
case <-waitCh:
return
}
}

7
contrib/dendrite-demo-tor/main.go
View file

@ -15,6 +15,7 @@
package main
import (
"os"
"time"
"github.com/getsentry/sentry-go"
@ -38,9 +39,13 @@ import (
"github.com/matrix-org/dendrite/userapi"
)
var _, skip = os.LookupEnv("CI")
func main() {
cfg := setup.ParseFlags(true)
if skip {
return
}
configErrors := &config.ConfigErrors{}
cfg.Verify(configErrors)
if len(*configErrors) > 0 {

67
contrib/dendrite-demo-tor/main_test.go
View file

@ -14,42 +14,39 @@ import (
// Generate HTML with coverage: go tool cover -html=/somewhere/where/there/is/integrationcover.out -o cover.html
// Source: https://dzone.com/articles/measuring-integration-test-coverage-rate-in-pouchc
func TestMain(t *testing.T) {
if _, ex := os.LookupEnv("CI"); ex {
t.Skip("skipping test, as no TOR/I2P client is available")
} else {
t.Log("running locally, continuing with tests")
var (
args []string
)
var (
args []string
)
for _, arg := range os.Args {
switch {
case strings.HasPrefix(arg, "DEVEL"):
case strings.HasPrefix(arg, "-test"):
default:
args = append(args, arg)
}
}
// only run the tests if there are args to be passed
if len(args) <= 1 {
return
}
waitCh := make(chan int, 1)
os.Args = args
go func() {
main()
close(waitCh)
}()
signalCh := make(chan os.Signal, 1)
signal.Notify(signalCh, syscall.SIGINT, syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGHUP)
select {
case <-signalCh:
return
case <-waitCh:
return
for _, arg := range os.Args {
switch {
case strings.HasPrefix(arg, "DEVEL"):
case strings.HasPrefix(arg, "-test"):
default:
args = append(args, arg)
}
}
// only run the tests if there are args to be passed
if len(args) <= 1 {
return
}
t.Log(args)
waitCh := make(chan int, 1)
os.Args = args
go func() {
main()
close(waitCh)
}()
signalCh := make(chan os.Signal, 1)
signal.Notify(signalCh, syscall.SIGINT, syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGHUP)
select {
case <-signalCh:
return
case <-waitCh:
return
}
}