change docker-compose to docker compose

change SessionPool's List as List ref remove unused tz field in the SessionPool Revert "change SessionPool's List as List ref" This reverts commit 890329f. debug
haoxins · Sep 14, 2024 · c37c273 · c37c273
1 parent 6804fc9
commit c37c273
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/client_test.go b/client_test.go
@@ -1330,10 +1330,10 @@ func TestReconnect(t *testing.T) {
  for i := 0; i < timeoutConfig.MaxConnPoolSize; i++ {
  time.Sleep(200 * time.Millisecond)
  if i == 3 {
- stopContainer(t, "nebula-docker-compose_graphd0_1")
+ stopContainer(t, "nebula-docker-compose-graphd0-1")
  }
  if i == 7 {
- stopContainer(t, "nebula-docker-compose_graphd1_1")
+ stopContainer(t, "nebula-docker-compose-graphd1-1")
  }
  _, err := session.Execute("SHOW HOSTS;")
  fmt.Println("Sending query...")
@@ -1351,8 +1351,8 @@ func TestReconnect(t *testing.T) {
  }
  checkResultSet(t, "SHOW HOSTS;", resp)
 
- startContainer(t, "nebula-docker-compose_graphd0_1")
- startContainer(t, "nebula-docker-compose_graphd1_1")
+ startContainer(t, "nebula-docker-compose-graphd0-1")
+ startContainer(t, "nebula-docker-compose-graphd1-1")
 
  // Wait for graphd to be up
  time.Sleep(5 * time.Second)

diff --git a/session_pool.go b/session_pool.go
@@ -39,7 +39,6 @@ type SessionPool struct {
  idleSessions list.List
  activeSessions list.List
  conf SessionPoolConf
- tz timezoneInfo
  log Logger
  closed bool
  cleanerChan chan struct{} //notify when pool is close

diff --git a/session_test.go b/session_test.go
@@ -101,15 +101,15 @@ func TestSession_Recover(t *testing.T) {
  _, _ = sess.Execute(query)
  }
  }()
- stopContainer(t, "nebula-docker-compose_graphd0_1")
- stopContainer(t, "nebula-docker-compose_graphd1_1")
- stopContainer(t, "nebula-docker-compose_graphd2_1")
+ stopContainer(t, "nebula-docker-compose-graphd0-1")
+ stopContainer(t, "nebula-docker-compose-graphd1-1")
+ stopContainer(t, "nebula-docker-compose-graphd2-1")
  defer func() {
- startContainer(t, "nebula-docker-compose_graphd1_1")
- startContainer(t, "nebula-docker-compose_graphd2_1")
+ startContainer(t, "nebula-docker-compose-graphd1-1")
+ startContainer(t, "nebula-docker-compose-graphd2-1")
  }()
  <-time.After(3 * time.Second)
- startContainer(t, "nebula-docker-compose_graphd0_1")
+ startContainer(t, "nebula-docker-compose-graphd0-1")
  <-time.After(3 * time.Second)
  _, err = sess.Execute(query)
  if err != nil {