test pkg should be in same pkg

.gitignore

@@ -15,6 +15,8 @@ ops.exe
 vendor/
 .idea
 
+cmd/nodejs*
+
 config*.json
 load*
 coverage.out

cmd/cmd_build_test.go

@@ -1,10 +1,9 @@
-package cmd_test
+package cmd
 
 import (
 	"os"
 	"testing"
 
-	"github.com/nanovms/ops/cmd"
 	"github.com/nanovms/ops/testutils"
 	"github.com/stretchr/testify/assert"
 )
@@ -13,7 +12,7 @@ func TestCmdBuild(t *testing.T) {
 	programPath := testutils.BuildBasicProgram()
 	defer os.Remove(programPath)
 
-	buildCmd := cmd.BuildCommand()
+	buildCmd := BuildCommand()
 
 	buildCmd.SetArgs([]string{programPath})
 

cmd/cmd_image_test.go

@@ -1,10 +1,9 @@
-package cmd_test
+package cmd
 
 import (
 	"os"
 	"testing"
 
-	"github.com/nanovms/ops/cmd"
 	"github.com/nanovms/ops/testutils"
 	"github.com/stretchr/testify/assert"
 )
@@ -13,7 +12,7 @@ func TestCreateImage(t *testing.T) {
 	basicProgram := testutils.BuildBasicProgram()
 	defer os.Remove(basicProgram)
 
-	createImageCmd := cmd.ImageCommands()
+	createImageCmd := ImageCommands()
 
 	createImageCmd.SetArgs([]string{"create", basicProgram})
 
@@ -27,7 +26,7 @@ func TestCreateImage(t *testing.T) {
 }
 
 func TestListImages(t *testing.T) {
-	listImagesCmd := cmd.ImageCommands()
+	listImagesCmd := ImageCommands()
 
 	listImagesCmd.SetArgs([]string{"list"})
 
@@ -39,7 +38,7 @@ func TestListImages(t *testing.T) {
 func TestDeleteImage(t *testing.T) {
 	imagePath := buildImage("test-img")
 
-	deleteImageCmd := cmd.ImageCommands()
+	deleteImageCmd := ImageCommands()
 
 	deleteImageCmd.SetArgs([]string{"delete", imagePath, "--assume-yes"})
 

cmd/cmd_instance_test.go

@@ -1,9 +1,8 @@
-package cmd_test
+package cmd
 
 import (
 	"testing"
 
-	"github.com/nanovms/ops/cmd"
 	"github.com/nanovms/ops/testutils"
 	"github.com/stretchr/testify/assert"
 )
@@ -15,7 +14,7 @@ func TestCreateInstance(t *testing.T) {
 
 	instanceName := imageName + testutils.String(5)
 
-	createInstanceCmd := cmd.InstanceCommands()
+	createInstanceCmd := InstanceCommands()
 
 	createInstanceCmd.SetArgs([]string{"create", imageName, "--instance-name", instanceName})
 
@@ -27,7 +26,7 @@ func TestCreateInstance(t *testing.T) {
 }
 
 func TestListInstances(t *testing.T) {
-	listInstancesCmd := cmd.InstanceCommands()
+	listInstancesCmd := InstanceCommands()
 
 	listInstancesCmd.SetArgs([]string{"list"})
 
@@ -41,7 +40,7 @@ func TestDeleteInstance(t *testing.T) {
 	defer removeImage(imageName)
 	instanceName := buildInstance(imageName)
 
-	deleteInstanceCmd := cmd.InstanceCommands()
+	deleteInstanceCmd := InstanceCommands()
 
 	deleteInstanceCmd.SetArgs([]string{"delete", instanceName})
 

cmd/cmd_pkg_test.go

@@ -1,15 +1,14 @@
-package cmd_test
+package cmd
 
 import (
 	"os"
 	"testing"
 
-	"github.com/nanovms/ops/cmd"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestListPkgCommand(t *testing.T) {
-	listPkgCmd := cmd.PackageCommands()
+	listPkgCmd := PackageCommands()
 
 	listPkgCmd.SetArgs([]string{"list"})
 
@@ -19,7 +18,7 @@ func TestListPkgCommand(t *testing.T) {
 }
 
 func TestGetPkgCommand(t *testing.T) {
-	getPkgCmd := cmd.PackageCommands()
+	getPkgCmd := PackageCommands()
 
 	getPkgCmd.SetArgs([]string{"get", "eyberg/bind:9.13.4", "--arch", "amd64"})
 
@@ -29,7 +28,7 @@ func TestGetPkgCommand(t *testing.T) {
 }
 
 func TestPkgContentsCommand(t *testing.T) {
-	getPkgCmd := cmd.PackageCommands()
+	getPkgCmd := PackageCommands()
 
 	getPkgCmd.SetArgs([]string{"contents", "eyberg/bind:9.13.4"})
 
@@ -39,7 +38,7 @@ func TestPkgContentsCommand(t *testing.T) {
 }
 
 func TestPkgDescribeCommand(t *testing.T) {
-	getPkgCmd := cmd.PackageCommands()
+	getPkgCmd := PackageCommands()
 
 	getPkgCmd.SetArgs([]string{"describe", "eyberg/bind:9.13.4", "--arch", "amd64"})
 
@@ -50,7 +49,7 @@ func TestPkgDescribeCommand(t *testing.T) {
 
 func TestLoad(t *testing.T) {
 
-	getPkgCmd := cmd.PackageCommands()
+	getPkgCmd := PackageCommands()
 
 	program := buildNodejsProgram()
 	defer os.Remove(program)
@@ -65,7 +64,7 @@ func TestLoad(t *testing.T) {
 }
 
 func TestPkgSearch(t *testing.T) {
-	searchPkgCmd := cmd.PackageCommands()
+	searchPkgCmd := PackageCommands()
 
 	searchPkgCmd.SetArgs([]string{"search", "mysql"})
 	err := searchPkgCmd.Execute()

cmd/cmd_profile_test.go

@@ -1,14 +1,13 @@
-package cmd_test
+package cmd
 
 import (
 	"testing"
 
-	"github.com/nanovms/ops/cmd"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestProfileCommand(t *testing.T) {
-	profileCommand := cmd.ProfileCommand()
+	profileCommand := ProfileCommand()
 
 	err := profileCommand.Execute()
 

cmd/cmd_run_test.go

@@ -1,10 +1,9 @@
-package cmd_test
+package cmd
 
 import (
 	"os"
 	"testing"
 
-	"github.com/nanovms/ops/cmd"
 	"github.com/nanovms/ops/testutils"
 	"github.com/stretchr/testify/assert"
 )
@@ -13,7 +12,7 @@ func TestRunCommand(t *testing.T) {
 	programPath := testutils.BuildBasicProgram()
 	defer os.Remove(programPath)
 
-	runCmd := cmd.RunCommand()
+	runCmd := RunCommand()
 
 	runCmd.SetArgs([]string{programPath})
 

cmd/cmd_version_test.go

@@ -1,14 +1,13 @@
-package cmd_test
+package cmd
 
 import (
 	"testing"
 
-	"github.com/nanovms/ops/cmd"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestVersionCommand(t *testing.T) {
-	versionCmd := cmd.VersionCommand()
+	versionCmd := VersionCommand()
 
 	err := versionCmd.Execute()
 

cmd/cmd_volume_test.go

@@ -1,4 +1,4 @@
-package cmd_test
+package cmd
 
 import (
 	"os"
@@ -8,12 +8,11 @@ import (
 	"github.com/nanovms/ops/testutils"
 	"github.com/nanovms/ops/types"
 
-	"github.com/nanovms/ops/cmd"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestCreateVolumeCommand(t *testing.T) {
-	createVolumeCmd := cmd.VolumeCommands()
+	createVolumeCmd := VolumeCommands()
 
 	createVolumeCmd.SetArgs([]string{"create", "test"})
 
@@ -23,7 +22,7 @@ func TestCreateVolumeCommand(t *testing.T) {
 }
 
 func TestListVolumesCommand(t *testing.T) {
-	listVolumesCmd := cmd.VolumeCommands()
+	listVolumesCmd := VolumeCommands()
 
 	listVolumesCmd.SetArgs([]string{"list"})
 
@@ -33,7 +32,7 @@ func TestListVolumesCommand(t *testing.T) {
 }
 
 func TestDeleteVolumeCommand(t *testing.T) {
-	deleteVolumeCmd := cmd.VolumeCommands()
+	deleteVolumeCmd := VolumeCommands()
 
 	deleteVolumeCmd.SetArgs([]string{"delete", "test"})
 
@@ -62,7 +61,7 @@ func TestAttachVolumeCommand(t *testing.T) {
 	volumeName := buildVolume("vol-test")
 	defer removeVolume(volumeName)
 
-	attachVolumeCmd := cmd.VolumeCommands()
+	attachVolumeCmd := VolumeCommands()
 
 	attachVolumeCmd.SetArgs([]string{"attach", instanceName, volumeName, "does not matter"})
 
@@ -94,7 +93,7 @@ func TestDetachVolumeCommand(t *testing.T) {
 	volumeName := buildVolume("vol-test")
 	defer removeVolume(volumeName)
 
-	attachVolumeCmd := cmd.VolumeCommands()
+	attachVolumeCmd := VolumeCommands()
 
 	attachVolumeCmd.SetArgs([]string{"attach", instanceName, volumeName, "does not matter"})
 
@@ -105,9 +104,7 @@ func TestDetachVolumeCommand(t *testing.T) {
 
 	assert.Nil(t, err)
 
-	//
-
-	detachVolumeCmd := cmd.VolumeCommands()
+	detachVolumeCmd := VolumeCommands()
 
 	detachVolumeCmd.SetArgs([]string{"detach", instanceName, volumeName})
 

cmd/flags_build_image_test.go

@@ -1,11 +1,10 @@
-package cmd_test
+package cmd
 
 import (
 	"testing"
 
 	"github.com/nanovms/ops/types"
 
-	"github.com/nanovms/ops/cmd"
 	"github.com/nanovms/ops/lepton"
 	"github.com/spf13/pflag"
 	"github.com/stretchr/testify/assert"
@@ -26,7 +25,7 @@ func TestCreateBuildImageFlags(t *testing.T) {
 		flagSet.Set("gateway", "192.168.1.254")
 		flagSet.Set("netmask", "255.255.0.0")
 
-		buildImageFlags := cmd.NewBuildImageCommandFlags(flagSet)
+		buildImageFlags := NewBuildImageCommandFlags(flagSet)
 
 		assert.Equal(t, buildImageFlags.CmdEnvs, []string{"test=1234"})
 		assert.Equal(t, buildImageFlags.TargetRoot, "unix")
@@ -48,15 +47,15 @@ func TestBuildImageFlagsMergeToConfig(t *testing.T) {
 
 		flagSet := pflag.NewFlagSet("test", 0)
 
-		cmd.PersistBuildImageCommandFlags(flagSet)
+		PersistBuildImageCommandFlags(flagSet)
 
 		flagSet.Set("args", "a b c d")
 		flagSet.Set("envs", "test=1234")
 		flagSet.Set("target-root", "unix")
 		flagSet.Set("imagename", "test-image")
 		flagSet.Set("mounts", volumeName+":/files")
 
-		buildImageFlags := cmd.NewBuildImageCommandFlags(flagSet)
+		buildImageFlags := NewBuildImageCommandFlags(flagSet)
 
 		opsPath := lepton.GetOpsHome() + "/" + lepton.LocalReleaseVersion
 		imagesPath := lepton.GetOpsHome() + "/images"
@@ -100,7 +99,7 @@ func TestBuildImageFlagsMergeToConfig(t *testing.T) {
 	t.Run("should clear ip/gateway/netmask if they are not valid ip addresses", func(t *testing.T) {
 		flagSet := newBuildImageFlagSet()
 
-		runLocalInstanceFlags := cmd.NewBuildImageCommandFlags(flagSet)
+		runLocalInstanceFlags := NewBuildImageCommandFlags(flagSet)
 		runLocalInstanceFlags.IPAddress = "tomato"
 		runLocalInstanceFlags.Gateway = "potato"
 		runLocalInstanceFlags.Netmask = "cheese"
@@ -133,6 +132,6 @@ func TestBuildImageFlagsMergeToConfig(t *testing.T) {
 func newBuildImageFlagSet() (flagSet *pflag.FlagSet) {
 	flagSet = pflag.NewFlagSet("test", 0)
 
-	cmd.PersistBuildImageCommandFlags(flagSet)
+	PersistBuildImageCommandFlags(flagSet)
 	return
 }