diff options
| author | Stas Vovk <stas@vovk.me> | 2015-10-16 14:21:51 +0300 |
|---|---|---|
| committer | Stas Vovk <stas@vovk.me> | 2015-10-16 14:21:51 +0300 |
| commit | 79fcb9808421dd93342a9538d05dd2259f5dd14b (patch) | |
| tree | 33a1a865144f280e37fde07a7c91ed8825c53801 /store/sql_store_test.go | |
| parent | 2bd81ff379acb347534e4d6a1a27624e0262deb0 (diff) | |
| parent | 50a8e2bd4fa53c6bb2f12a03237be4fbaf259617 (diff) | |
| download | chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.tar.gz chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.tar.bz2 chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.zip | |
Merge remote-tracking branch 'upstream/master' into PLT-637
Conflicts:
web/react/utils/constants.jsx
Diffstat (limited to 'store/sql_store_test.go')
| -rw-r--r-- | store/sql_store_test.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/store/sql_store_test.go b/store/sql_store_test.go index a9e25cb33..1e04b676c 100644 --- a/store/sql_store_test.go +++ b/store/sql_store_test.go @@ -4,10 +4,11 @@ package store import ( - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" "strings" "testing" + + "github.com/mattermost/platform/model" + "github.com/mattermost/platform/utils" ) var store Store @@ -16,6 +17,8 @@ func Setup() { if store == nil { utils.LoadConfig("config.json") store = NewSqlStore() + + store.MarkSystemRanUnitTests() } } |