test(sharness): improve reliability of ma-pipe-unidir
Write the PID file after listening.
Steven Allen committed
Oct 28, 2019 at 21:54 UTC
67da056908610ee3e6d09fcc4aeff7def71d4e74
2 files changed
+22
-11
test/dependencies/ma-pipe-unidir/main.go
+21
-10
@@ -43,16 +43,6 @@ func app() int {
43
return 1
44
}
45
46
- if len(opts.PidFile) > 0 {
47
- data := []byte(strconv.Itoa(os.Getpid()))
48
- err := ioutil.WriteFile(opts.PidFile, data, 0644)
49
- if err != nil {
50
- return 1
51
- }
52
-
53
- defer os.Remove(opts.PidFile)
54
- }
55
-
46
maddr, err := ma.NewMultiaddr(addr)
47
if err != nil {
48
return 1
@@ -66,6 +56,16 @@ func app() int {
56
return 1
57
}
58
59
+ if len(opts.PidFile) > 0 {
60
+ data := []byte(strconv.Itoa(os.Getpid()))
61
+ err := ioutil.WriteFile(opts.PidFile, data, 0644)
62
+ if err != nil {
63
+ return 1
64
+ }
65
+
66
+ defer os.Remove(opts.PidFile)
67
+ }
68
+
69
conn, err = listener.Accept()
70
if err != nil {
71
return 1
@@ -76,6 +76,17 @@ func app() int {
76
if err != nil {
77
return 1
78
}
79
+
80
+ if len(opts.PidFile) > 0 {
81
+ data := []byte(strconv.Itoa(os.Getpid()))
82
+ err := ioutil.WriteFile(opts.PidFile, data, 0644)
83
+ if err != nil {
84
+ return 1
85
+ }
86
+
87
+ defer os.Remove(opts.PidFile)
88
+ }
89
+
90
}
91
92
defer conn.Close()
test/sharness/t0180-p2p.sh
+1
-1
@@ -84,7 +84,7 @@ test_expect_success 'S->C Setup(dnsaddr/addr/ipfs/peerID) client side' '
84
'
85
86
test_expect_success 'S->C Setup(dnsaddr/addr) client side' '
87
- ipfsi 1 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10104 /dnsaddr/bootstrap.libp2p.io/ 2>&1 > dialer-stdouterr.log
87
+ ipfsi 1 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10104 /dnsaddr/bootstrap.libp2p.io 2>&1 > dialer-stdouterr.log
88
'
89
90