diff --git a/gortsplib_test.go b/gortsplib_test.go deleted file mode 100644 index e927c9dd..00000000 --- a/gortsplib_test.go +++ /dev/null @@ -1,53 +0,0 @@ -package gortsplib - -import ( - "os" - "os/exec" - "strconv" - "time" -) - -type container struct { - name string -} - -func newContainer(image string, name string, args []string) (*container, error) { - c := &container{ - name: name, - } - - exec.Command("docker", "kill", "gortsplib-test-"+name).Run() - exec.Command("docker", "wait", "gortsplib-test-"+name).Run() - - cmd := []string{"docker", "run", - "--network=host", - "--name=gortsplib-test-" + name, - "gortsplib-test-" + image} - cmd = append(cmd, args...) - ecmd := exec.Command(cmd[0], cmd[1:]...) - ecmd.Stdout = nil - ecmd.Stderr = os.Stderr - - err := ecmd.Start() - if err != nil { - return nil, err - } - - time.Sleep(1 * time.Second) - - return c, nil -} - -func (c *container) close() { - exec.Command("docker", "kill", "gortsplib-test-"+c.name).Run() - exec.Command("docker", "wait", "gortsplib-test-"+c.name).Run() - exec.Command("docker", "rm", "gortsplib-test-"+c.name).Run() -} - -func (c *container) wait() int { - exec.Command("docker", "wait", "gortsplib-test-"+c.name).Run() - out, _ := exec.Command("docker", "inspect", "gortsplib-test-"+c.name, - "--format={{.State.ExitCode}}").Output() - code, _ := strconv.ParseInt(string(out[:len(out)-1]), 10, 64) - return int(code) -} diff --git a/server_test.go b/server_test.go index 9ddfb38c..6c04de02 100644 --- a/server_test.go +++ b/server_test.go @@ -5,6 +5,8 @@ import ( "crypto/tls" "fmt" "net" + "os" + "os/exec" "strconv" "sync" "testing" @@ -137,6 +139,51 @@ func (sh *testServerHandler) OnGetParameter(ctx *ServerHandlerOnGetParameterCtx) return nil, fmt.Errorf("unimplemented") } +type container struct { + name string +} + +func newContainer(image string, name string, args []string) (*container, error) { + c := &container{ + name: name, + } + + exec.Command("docker", "kill", "gortsplib-test-"+name).Run() + exec.Command("docker", "wait", "gortsplib-test-"+name).Run() + + cmd := []string{"docker", "run", + "--network=host", + "--name=gortsplib-test-" + name, + "gortsplib-test-" + image} + cmd = append(cmd, args...) + ecmd := exec.Command(cmd[0], cmd[1:]...) + ecmd.Stdout = nil + ecmd.Stderr = os.Stderr + + err := ecmd.Start() + if err != nil { + return nil, err + } + + time.Sleep(1 * time.Second) + + return c, nil +} + +func (c *container) close() { + exec.Command("docker", "kill", "gortsplib-test-"+c.name).Run() + exec.Command("docker", "wait", "gortsplib-test-"+c.name).Run() + exec.Command("docker", "rm", "gortsplib-test-"+c.name).Run() +} + +func (c *container) wait() int { + exec.Command("docker", "wait", "gortsplib-test-"+c.name).Run() + out, _ := exec.Command("docker", "inspect", "gortsplib-test-"+c.name, + "--format={{.State.ExitCode}}").Output() + code, _ := strconv.ParseInt(string(out[:len(out)-1]), 10, 64) + return int(code) +} + var serverCert = []byte(`-----BEGIN CERTIFICATE----- MIIDazCCAlOgAwIBAgIUXw1hEC3LFpTsllv7D3ARJyEq7sIwDQYJKoZIhvcNAQEL BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM