From c6ba5c32d62f8c1fd0e0669a3df0c844ec794590 Mon Sep 17 00:00:00 2001
From: Martin Kraft <martinkraft@gmail.com>
Date: Fri, 18 May 2018 08:41:44 -0400
Subject: Merge fix.

---
 cmd/commands/permissions_test.go            | 40 -----------------------------
 cmd/mattermost/commands/permissions_test.go | 40 +++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 40 deletions(-)
 delete mode 100644 cmd/commands/permissions_test.go
 create mode 100644 cmd/mattermost/commands/permissions_test.go

diff --git a/cmd/commands/permissions_test.go b/cmd/commands/permissions_test.go
deleted file mode 100644
index eeaa17109..000000000
--- a/cmd/commands/permissions_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 2018-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-package commands
-
-import (
-	"os"
-	"os/exec"
-	"strings"
-	"testing"
-
-	"github.com/mattermost/mattermost-server/api4"
-	"github.com/mattermost/mattermost-server/utils"
-)
-
-func TestPermissionsExport_rejectsUnlicensed(t *testing.T) {
-	permissionsLicenseRequiredTest(t, "export")
-}
-
-func TestPermissionsImport_rejectsUnlicensed(t *testing.T) {
-	permissionsLicenseRequiredTest(t, "import")
-}
-
-func permissionsLicenseRequiredTest(t *testing.T, subcommand string) {
-	th := api4.Setup().InitBasic()
-	defer th.TearDown()
-
-	path, err := os.Executable()
-	if err != nil {
-		t.Fail()
-	}
-	args := []string{"-test.run", "ExecCommand", "--", "--disableconfigwatch", "permissions", subcommand}
-	output, err := exec.Command(path, args...).CombinedOutput()
-
-	actual := string(output)
-	expected := utils.T("cli.license.critical")
-	if !strings.Contains(actual, expected) {
-		t.Errorf("Expected '%v' but got '%v'.", expected, actual)
-	}
-}
diff --git a/cmd/mattermost/commands/permissions_test.go b/cmd/mattermost/commands/permissions_test.go
new file mode 100644
index 000000000..eeaa17109
--- /dev/null
+++ b/cmd/mattermost/commands/permissions_test.go
@@ -0,0 +1,40 @@
+// Copyright (c) 2018-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+package commands
+
+import (
+	"os"
+	"os/exec"
+	"strings"
+	"testing"
+
+	"github.com/mattermost/mattermost-server/api4"
+	"github.com/mattermost/mattermost-server/utils"
+)
+
+func TestPermissionsExport_rejectsUnlicensed(t *testing.T) {
+	permissionsLicenseRequiredTest(t, "export")
+}
+
+func TestPermissionsImport_rejectsUnlicensed(t *testing.T) {
+	permissionsLicenseRequiredTest(t, "import")
+}
+
+func permissionsLicenseRequiredTest(t *testing.T, subcommand string) {
+	th := api4.Setup().InitBasic()
+	defer th.TearDown()
+
+	path, err := os.Executable()
+	if err != nil {
+		t.Fail()
+	}
+	args := []string{"-test.run", "ExecCommand", "--", "--disableconfigwatch", "permissions", subcommand}
+	output, err := exec.Command(path, args...).CombinedOutput()
+
+	actual := string(output)
+	expected := utils.T("cli.license.critical")
+	if !strings.Contains(actual, expected) {
+		t.Errorf("Expected '%v' but got '%v'.", expected, actual)
+	}
+}
-- 
cgit v1.2.3-1-g7c22