Merge pull request #2087 from nats-io/fix_tmp_pid_file

Fixed expected pid path in options
This commit is contained in:
Ivan Kozlovic
2021-04-08 16:10:04 -06:00
committed by GitHub
2 changed files with 4 additions and 6 deletions

View File

@@ -21,7 +21,6 @@ import (
"io/ioutil"
"net/url"
"os"
"path/filepath"
"reflect"
"runtime"
"strings"
@@ -104,7 +103,7 @@ func TestConfigFile(t *testing.T) {
Logtime: false,
HTTPPort: 8222,
HTTPBasePath: "/nats",
PidFile: filepath.Join(tempRoot, "nats-server.pid"),
PidFile: "/tmp/nats-server/nats-server.pid",
ProfPort: 6543,
Syslog: true,
RemoteSyslog: "udp://foo.com:33",
@@ -261,7 +260,7 @@ func TestMergeOverrides(t *testing.T) {
Logtime: false,
HTTPPort: DEFAULT_HTTP_PORT,
HTTPBasePath: DEFAULT_HTTP_BASE_PATH,
PidFile: filepath.Join(tempRoot, "nats-server.pid"),
PidFile: "/tmp/nats-server/nats-server.pid",
ProfPort: 6789,
Syslog: true,
RemoteSyslog: "udp://foo.com:33",
@@ -1168,7 +1167,7 @@ func TestOptionsClone(t *testing.T) {
Logtime: false,
HTTPPort: DEFAULT_HTTP_PORT,
HTTPBasePath: DEFAULT_HTTP_BASE_PATH,
PidFile: filepath.Join(tempRoot, "nats-server.pid"),
PidFile: "/tmp/nats-server/nats-server.pid",
ProfPort: 6789,
Syslog: true,
RemoteSyslog: "udp://foo.com:33",

View File

@@ -19,7 +19,6 @@ import (
"fmt"
"net"
"net/url"
"path/filepath"
"strconv"
"strings"
"sync"
@@ -81,7 +80,7 @@ func TestRouteConfig(t *testing.T) {
NoAdvertise: true,
ConnectRetries: 2,
},
PidFile: filepath.Join(tempRoot, "nats_cluster_test.pid"),
PidFile: "/tmp/nats-server/nats_cluster_test.pid",
}
// Setup URLs