summaryrefslogtreecommitdiffstats
path: root/model
diff options
context:
space:
mode:
authorDaniel Schalla <daniel@schalla.me>2018-09-03 14:08:40 +0200
committerJesús Espino <jespinog@gmail.com>2018-09-03 14:08:40 +0200
commit531897b1f0d8176c1f983f921f1d1de618db0131 (patch)
tree0f01811eee640141b6a1959ed64a7b250fd59d47 /model
parent68fdaaa995555e93f067efc3a07f1866e43ae665 (diff)
downloadchat-531897b1f0d8176c1f983f921f1d1de618db0131.tar.gz
chat-531897b1f0d8176c1f983f921f1d1de618db0131.tar.bz2
chat-531897b1f0d8176c1f983f921f1d1de618db0131.zip
add megacheck as makefile target (#9288)
Fix code issues in channel_test.go Fix Channel Test Issues detected by Megacheck Fix API Emoji Test Issues detected by Megacheck Fixed API Issues Reported by Megacheck Fixed App issues reported by megacheck Remaining fixes removed test added by mistake from old HEAD gofmt Store Fixes simplified returns Fix test for multi member channel delete revert to delete unused function
Diffstat (limited to 'model')
-rw-r--r--model/config.go2
-rw-r--r--model/session_test.go2
-rw-r--r--model/user_test.go2
3 files changed, 3 insertions, 3 deletions
diff --git a/model/config.go b/model/config.go
index c0f443b72..5cc1a4edc 100644
--- a/model/config.go
+++ b/model/config.go
@@ -2370,7 +2370,7 @@ func (ss *ServiceSettings) isValid() *AppError {
}
}
- host, port, err := net.SplitHostPort(*ss.ListenAddress)
+ host, port, _ := net.SplitHostPort(*ss.ListenAddress)
var isValidHost bool
if host == "" {
isValidHost = true
diff --git a/model/session_test.go b/model/session_test.go
index bf32d2f09..88e0bdd43 100644
--- a/model/session_test.go
+++ b/model/session_test.go
@@ -31,7 +31,7 @@ func TestSessionDeepCopy(t *testing.T) {
session = &Session{Id: sessionId}
copySession = session.DeepCopy()
- assert.Equal(t, sessionId, session.Id)
+ assert.Equal(t, sessionId, copySession.Id)
session = &Session{TeamMembers: []*TeamMember{}}
copySession = session.DeepCopy()
diff --git a/model/user_test.go b/model/user_test.go
index f86b52919..d7f7b6711 100644
--- a/model/user_test.go
+++ b/model/user_test.go
@@ -52,7 +52,7 @@ func TestUserDeepCopy(t *testing.T) {
user = &User{Id: id}
copyUser = user.DeepCopy()
- assert.Equal(t, id, user.Id)
+ assert.Equal(t, id, copyUser.Id)
}
func TestUserJson(t *testing.T) {