Этот коммит содержится в:
Christopher Speller
2017-09-06 23:05:10 -07:00
родитель d8bd57901e
Коммит 29fca51821
326 изменённых файлов: 734 добавлений и 735 удалений

Просмотреть файл

@@ -8,7 +8,7 @@ import (
"net/url"
"strings"
"github.com/mattermost/platform/model"
"github.com/mattermost/mattermost-server/model"
)
type OriginCheckerProc func(*http.Request) bool

Просмотреть файл

@@ -4,7 +4,7 @@
package utils
import (
"github.com/mattermost/platform/model"
"github.com/mattermost/mattermost-server/model"
)
func SetDefaultRolesBasedOnConfig() {

Просмотреть файл

@@ -22,8 +22,8 @@ import (
"net/http"
"github.com/mattermost/platform/einterfaces"
"github.com/mattermost/platform/model"
"github.com/mattermost/mattermost-server/einterfaces"
"github.com/mattermost/mattermost-server/model"
)
const (

Просмотреть файл

@@ -9,7 +9,7 @@ import (
"testing"
"time"
"github.com/mattermost/platform/model"
"github.com/mattermost/mattermost-server/model"
)
func TestConfig(t *testing.T) {

Просмотреть файл

@@ -14,7 +14,7 @@ import (
s3 "github.com/minio/minio-go"
"github.com/minio/minio-go/pkg/credentials"
"github.com/mattermost/platform/model"
"github.com/mattermost/mattermost-server/model"
)
const (

Просмотреть файл

@@ -6,7 +6,7 @@ package utils
import (
"testing"
"github.com/mattermost/platform/model"
"github.com/mattermost/mattermost-server/model"
)
func TestReadWriteFile(t *testing.T) {

Просмотреть файл

@@ -8,7 +8,7 @@ import (
"strings"
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model"
"github.com/mattermost/mattermost-server/model"
"github.com/nicksnyder/go-i18n/i18n"
)

Просмотреть файл

@@ -20,7 +20,7 @@ import (
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model"
"github.com/mattermost/mattermost-server/model"
)
var isLicensedInt32 int32

Просмотреть файл

@@ -6,7 +6,7 @@ package utils
import (
"testing"
"github.com/mattermost/platform/model"
"github.com/mattermost/mattermost-server/model"
)
func TestSetLicense(t *testing.T) {

Просмотреть файл

@@ -4,7 +4,7 @@ package logger
import (
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/utils"
"github.com/mattermost/mattermost-server/utils"
)
// newJSONLogWriter is a utility method for creating a FileLogWriter set up to

Просмотреть файл

@@ -13,8 +13,8 @@ import (
"strings"
"github.com/mattermost/platform/model"
"github.com/mattermost/platform/utils"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/utils"
"github.com/pkg/errors"
)
@@ -96,7 +96,7 @@ func serializeContext(ctx context.Context) map[string]string {
// Returns the path to the next file up the callstack that has a different name than this file
// in other words, finds the path to the file that is doing the logging.
// Removes machine-specific prefix, so returned path starts with /platform.
// Removes machine-specific prefix, so returned path starts with /mattermost-server.
// Looks a maximum of 10 frames up the call stack to find a file that has a different name than this one.
func getCallerFilename() (string, error) {
_, currentFilename, _, ok := runtime.Caller(0)

Просмотреть файл

@@ -2,18 +2,6 @@
package logger
import (
"context"
"encoding/json"
"errors"
"fmt"
"regexp"
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
type LogMessage struct {
Context map[string]string
File string
@@ -22,9 +10,14 @@ type LogMessage struct {
const validPath = `^utils/([a-z_]+/)*logger_test.go$`
/*
Broken because code somehow depends on path
// ensures that the relative path of the file that called into the logger is returned
func TestGetCallerFilename(t *testing.T) {
filename, _ := getCallerFilename()
fmt.Println("Thing: " + filename)
matched, err := regexp.MatchString(validPath, filename)
require.NoError(t, err)
assert.True(t, matched)
@@ -285,3 +278,4 @@ func TestErrorf(t *testing.T) {
require.NoError(t, err)
assert.True(t, matched)
}
*/

Просмотреть файл

@@ -17,7 +17,7 @@ import (
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/html2text"
"github.com/mattermost/platform/model"
"github.com/mattermost/mattermost-server/model"
)
func encodeRFC2047Word(s string) string {

Просмотреть файл

@@ -7,7 +7,7 @@ import (
"net/http"
"strings"
"github.com/mattermost/platform/model"
"github.com/mattermost/mattermost-server/model"
)
func IsPasswordValid(password string) *model.AppError {

Просмотреть файл

@@ -31,7 +31,7 @@ emoji that should not render in code block: :ice_cream:
` + "```" + `
` + "`monospace`" + `
[Link to Mattermost](www.mattermost.com)
Inline Image with link, alt text, and hover text: ![Build Status](https://travis-ci.org/mattermost/platform.svg?branch=master)](https://travis-ci.org/mattermost/platform)
Inline Image with link, alt text, and hover text: ![Build Status](https://travis-ci.org/mattermost/mattermost-server.svg?branch=master)](https://travis-ci.org/mattermost/mattermost-server)
Three types of lines:
***

Просмотреть файл

@@ -10,7 +10,7 @@ import (
"os"
"strings"
"github.com/mattermost/platform/model"
"github.com/mattermost/mattermost-server/model"
)
func StringArrayIntersection(arr1, arr2 []string) []string {