Skip to content

Commit

Permalink
Move "test" directory to "pkg/testutils"
Browse files Browse the repository at this point in the history
Having top level directories called "test" and "tests" is
rather confusing. For even more confusion the go files in
the "test" directory declare they are in a go package called
"rest". Rename the "test" directory to "pkg/testutils" and
the go package to "testutils".

Signed-off-by: Daniel P. Berrange <[email protected]>
  • Loading branch information
berrange committed Jul 20, 2017
1 parent 6c8c29e commit 605517e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions test/matchers.go → pkg/testutils/matchers.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,19 @@
*
*/

package rest
package testutils

import (
"encoding/json"
"fmt"
"reflect"

"github.com/ghodss/yaml"
"github.com/onsi/gomega/types"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/client-go/rest"

rest2 "kubevirt.io/kubevirt/pkg/rest"
"reflect"
)

func RepresentMimeType(expected interface{}) types.GomegaMatcher {
Expand Down
2 changes: 1 addition & 1 deletion pkg/virt-api/rest/kubeproxy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ import (
"kubevirt.io/kubevirt/pkg/kubecli"
"kubevirt.io/kubevirt/pkg/logging"
rest2 "kubevirt.io/kubevirt/pkg/rest"
. "kubevirt.io/kubevirt/pkg/testutils"
. "kubevirt.io/kubevirt/pkg/virt-api/rest"
. "kubevirt.io/kubevirt/test"
)

const vmResource = "vms"
Expand Down

0 comments on commit 605517e

Please sign in to comment.