diff options
author | Chris <ccbrown112@gmail.com> | 2017-10-12 12:24:54 -0700 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2017-10-12 12:24:54 -0700 |
commit | 917e4789c2fde00bcae0f0ccc82b3c3815e1d38a (patch) | |
tree | 115270abbda7c7991fbfc419aff465b29fec1f88 /store | |
parent | 86a0e16035fa94487c606d925fd856164481a60f (diff) | |
download | chat-917e4789c2fde00bcae0f0ccc82b3c3815e1d38a.tar.gz chat-917e4789c2fde00bcae0f0ccc82b3c3815e1d38a.tar.bz2 chat-917e4789c2fde00bcae0f0ccc82b3c3815e1d38a.zip |
Use tmpfs containers for api/api4 tests, move and speed up CLI tests (#7606)
* use tmpfs containers for api/api4, move and speed up cli tests
* minor optimizations
* add missing files, fix pre-existing race condition
* add . to TestMain check
* add requested log message
Diffstat (limited to 'store')
-rw-r--r-- | store/sqlstore/store_test.go | 3 | ||||
-rw-r--r-- | store/storetest/docker.go | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/store/sqlstore/store_test.go b/store/sqlstore/store_test.go index d627ad0eb..d1a5714d6 100644 --- a/store/sqlstore/store_test.go +++ b/store/sqlstore/store_test.go @@ -4,7 +4,6 @@ package sqlstore import ( - "flag" "os" "sync" "testing" @@ -99,8 +98,6 @@ func tearDownStores() { } func TestMain(m *testing.M) { - flag.Parse() - utils.TranslationsPreInit() utils.LoadConfig("config.json") utils.InitTranslations(utils.Cfg.LocalizationSettings) diff --git a/store/storetest/docker.go b/store/storetest/docker.go index e62190ef2..cd2a3075a 100644 --- a/store/storetest/docker.go +++ b/store/storetest/docker.go @@ -31,7 +31,7 @@ type RunningContainer struct { } func (c *RunningContainer) Stop() error { - l4g.Info("removing container: %v", c.Id) + l4g.Info("Removing container: %v", c.Id) return exec.Command("docker", "rm", "-f", c.Id).Run() } @@ -111,7 +111,7 @@ func runContainer(args []string) (*RunningContainer, error) { exec.Command("docker", "rm", "-f", id).Run() return nil, err } - l4g.Info("running container: %v", id) + l4g.Info("Running container: %v", id) return &RunningContainer{containers[0]}, nil } |