Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8355 from heyitsanthony/expect-fd

Browse Source 
e2e: remove SIGQUIT debugging for elect and lock
This commit is contained in:
Anthony Romano 2017-08-03 17:18:17 -07:00 committed by GitHub
commit faa4a62410
2 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
e2e/ctl_v3_elect_test.go
View File

@ -32,10 +32,6 @@ func TestCtlV3Elect(t *testing.T) {
} }
func testElect(cx ctlCtx) { func testElect(cx ctlCtx) {
// debugging for #6934
sig := cx.epc.WithStopSignal(debugLockSignal)
defer cx.epc.WithStopSignal(sig)
name := "a" name := "a"
holder, ch, err := ctlV3Elect(cx, name, "p1") holder, ch, err := ctlV3Elect(cx, name, "p1")
@ -112,7 +108,6 @@ func ctlV3Elect(cx ctlCtx, name, proposal string) (*expect.ExpectProcess, <-chan
close(outc) close(outc)
return proc, outc, err return proc, outc, err
} }
proc.StopSignal = debugLockSignal
go func() { go func() {
s, xerr := proc.ExpectFunc(func(string) bool { return true }) s, xerr := proc.ExpectFunc(func(string) bool { return true })
if xerr != nil { if xerr != nil {

28
e2e/ctl_v3_lock_test.go
View File

@ -16,36 +16,13 @@ package e2e
import ( import (
"os" "os"
"runtime"
"strings" "strings"
"syscall"
"testing" "testing"
"time" "time"
"github.com/coreos/etcd/pkg/expect" "github.com/coreos/etcd/pkg/expect"
) )
// debugLockSignal forces SIGQUIT to debug etcdctl elect and lock failures
var debugLockSignal os.Signal
func init() {
// hacks to ignore SIGQUIT debugging for some builds
switch {
case os.Getenv("COVERDIR") != "":
// SIGQUIT interferes with coverage collection
debugLockSignal = syscall.SIGTERM
case runtime.GOARCH == "ppc64le":
// ppc64le's signal handling won't kill processes with SIGQUIT
// in the same way as amd64/i386, so processes won't terminate
// as expected. Since this debugging code for CI, just ignore
// ppc64le.
debugLockSignal = syscall.SIGKILL
default:
// stack dumping OK
debugLockSignal = syscall.SIGQUIT
}
}
func TestCtlV3Lock(t *testing.T) { func TestCtlV3Lock(t *testing.T) {
oldenv := os.Getenv("EXPECT_DEBUG") oldenv := os.Getenv("EXPECT_DEBUG")
defer os.Setenv("EXPECT_DEBUG", oldenv) defer os.Setenv("EXPECT_DEBUG", oldenv)
@ -55,10 +32,6 @@ func TestCtlV3Lock(t *testing.T) {
} }
func testLock(cx ctlCtx) { func testLock(cx ctlCtx) {
// debugging for #6464
sig := cx.epc.WithStopSignal(debugLockSignal)
defer cx.epc.WithStopSignal(sig)
name := "a" name := "a"
holder, ch, err := ctlV3Lock(cx, name) holder, ch, err := ctlV3Lock(cx, name)
@ -135,7 +108,6 @@ func ctlV3Lock(cx ctlCtx, name string) (*expect.ExpectProcess, <-chan string, er
close(outc) close(outc)
return proc, outc, err return proc, outc, err
} }
proc.StopSignal = debugLockSignal
go func() { go func() {
s, xerr := proc.ExpectFunc(func(string) bool { return true }) s, xerr := proc.ExpectFunc(func(string) bool { return true })
if xerr != nil { if xerr != nil {