diff options
| author | Chris <ccbrown112@gmail.com> | 2017-10-09 14:59:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-09 14:59:48 -0700 |
| commit | bff2b5e735ae7fc80157b4108ddbe56be8acb752 (patch) | |
| tree | 14867d2bff71b6b638b0b358b1f38eb062cb597f /store | |
| parent | 0f66b6e72621842467d0e368b95ee58f485d4ace (diff) | |
| download | chat-bff2b5e735ae7fc80157b4108ddbe56be8acb752.tar.gz chat-bff2b5e735ae7fc80157b4108ddbe56be8acb752.tar.bz2 chat-bff2b5e735ae7fc80157b4108ddbe56be8acb752.zip | |
Miscellaneous app cleanup (#7594)
* app cleanup
* whoops, forgot a file
* some minor cleanup
* longer container deadline
* defensive checks
Diffstat (limited to 'store')
| -rw-r--r-- | store/sqlstore/store_test.go | 8 | ||||
| -rw-r--r-- | store/sqlstore/upgrade.go | 8 | ||||
| -rw-r--r-- | store/storetest/docker.go | 3 |
3 files changed, 12 insertions, 7 deletions
diff --git a/store/sqlstore/store_test.go b/store/sqlstore/store_test.go index d99c7e441..d627ad0eb 100644 --- a/store/sqlstore/store_test.go +++ b/store/sqlstore/store_test.go @@ -85,8 +85,12 @@ func tearDownStores() { for _, st := range storeTypes { st := st go func() { - st.Store.Close() - st.Container.Stop() + if st.Store != nil { + st.Store.Close() + } + if st.Container != nil { + st.Container.Stop() + } wg.Done() }() } diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index 6da95d437..5f466cf51 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -312,8 +312,8 @@ func UpgradeDatabaseToVersion43(sqlStore SqlStore) { } func UpgradeDatabaseToVersion44(sqlStore SqlStore) { - if shouldPerformUpgrade(sqlStore, VERSION_4_3_0, VERSION_4_4_0) { - // TODO: Uncomment following when version 4.4.0 is released - //saveSchemaVersion(sqlStore, VERSION_4_4_0) - } + // TODO: Uncomment following when version 4.4.0 is released + //if shouldPerformUpgrade(sqlStore, VERSION_4_3_0, VERSION_4_4_0) { + // saveSchemaVersion(sqlStore, VERSION_4_4_0) + //} } diff --git a/store/storetest/docker.go b/store/storetest/docker.go index ef34541e4..e62190ef2 100644 --- a/store/storetest/docker.go +++ b/store/storetest/docker.go @@ -116,7 +116,8 @@ func runContainer(args []string) (*RunningContainer, error) { } func waitForPort(port string) error { - for i := 0; i < 120; i++ { + deadline := time.Now().Add(time.Minute * 10) + for time.Now().Before(deadline) { conn, err := net.DialTimeout("tcp", "127.0.0.1:"+port, time.Minute) if err != nil { return err |