Move package from tests/workspace/common to pkg/integration/common

jenting · jenting · commit 6fd722062614 · 2022-04-27T07:18:41.000Z
Signed-off-by: JenTing Hsiao &lt;hsiaoairplane@gmail.com&gt;
diff --git a/test/pkg/integration/common/cgroup.go b/test/pkg/integration/common/cgroup.go
diff --git a/test/tests/workspace/cgroup_v2_test.go b/test/tests/workspace/cgroup_v2_test.go
@@ -18,7 +18,7 @@ import (
 
 	agent "github.com/gitpod-io/gitpod/test/pkg/agent/workspace/api"
 	"github.com/gitpod-io/gitpod/test/pkg/integration"
-	"github.com/gitpod-io/gitpod/test/tests/workspace/common"
+	"github.com/gitpod-io/gitpod/test/pkg/integration/common"
 	"github.com/google/go-cmp/cmp"
 )
 
diff --git a/test/tests/workspace/common/git-client.go b/test/tests/workspace/common/git-client.go
diff --git a/test/tests/workspace/contexts_test.go b/test/tests/workspace/contexts_test.go
@@ -14,7 +14,7 @@ import (
 	"sigs.k8s.io/e2e-framework/pkg/features"
 
 	"github.com/gitpod-io/gitpod/test/pkg/integration"
-	"github.com/gitpod-io/gitpod/test/tests/workspace/common"
+	"github.com/gitpod-io/gitpod/test/pkg/integration/common"
 )
 
 type ContextTest struct {
diff --git a/test/tests/workspace/git_test.go b/test/tests/workspace/git_test.go
@@ -15,7 +15,7 @@ import (
 
 	agent "github.com/gitpod-io/gitpod/test/pkg/agent/workspace/api"
 	"github.com/gitpod-io/gitpod/test/pkg/integration"
-	"github.com/gitpod-io/gitpod/test/tests/workspace/common"
+	"github.com/gitpod-io/gitpod/test/pkg/integration/common"
 )
 
 //
diff --git a/test/tests/workspace/k3s_test.go b/test/tests/workspace/k3s_test.go
@@ -14,7 +14,7 @@ import (
 
 	agent "github.com/gitpod-io/gitpod/test/pkg/agent/workspace/api"
 	"github.com/gitpod-io/gitpod/test/pkg/integration"
-	"github.com/gitpod-io/gitpod/test/tests/workspace/common"
+	"github.com/gitpod-io/gitpod/test/pkg/integration/common"
 )
 
 func TestK3s(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ import (`
`18`	`18`
`19`	`19`	`agent "github.com/gitpod-io/gitpod/test/pkg/agent/workspace/api"`
`20`	`20`	`"github.com/gitpod-io/gitpod/test/pkg/integration"`
`21`		`- "github.com/gitpod-io/gitpod/test/tests/workspace/common"`
	`21`	`+ "github.com/gitpod-io/gitpod/test/pkg/integration/common"`
`22`	`22`	`"github.com/google/go-cmp/cmp"`
`23`	`23`	`)`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`	`"sigs.k8s.io/e2e-framework/pkg/features"`
`15`	`15`
`16`	`16`	`"github.com/gitpod-io/gitpod/test/pkg/integration"`
`17`		`- "github.com/gitpod-io/gitpod/test/tests/workspace/common"`
	`17`	`+ "github.com/gitpod-io/gitpod/test/pkg/integration/common"`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`type ContextTest struct {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`
`16`	`16`	`agent "github.com/gitpod-io/gitpod/test/pkg/agent/workspace/api"`
`17`	`17`	`"github.com/gitpod-io/gitpod/test/pkg/integration"`
`18`		`- "github.com/gitpod-io/gitpod/test/tests/workspace/common"`
	`18`	`+ "github.com/gitpod-io/gitpod/test/pkg/integration/common"`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`//`