Move some tests from imagevalidation to packagevalidation (#880)

* Move some tests from imagevalidation to packagevalidation * Convert imagevalidation to hostnamevalidation * gofmt * Rename image validation test go file
GoogleCloudPlatform · Oct 20, 2023 · df09495 · df09495
1 parent 4c231e9
commit df09495
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 11 deletions.
diff --git a/imagetest/cmd/manager/main.go b/imagetest/cmd/manager/main.go
@@ -15,13 +15,14 @@ import (
 	"github.com/GoogleCloudPlatform/guest-test-infra/imagetest"
 	"github.com/GoogleCloudPlatform/guest-test-infra/imagetest/test_suites/cvm"
 	"github.com/GoogleCloudPlatform/guest-test-infra/imagetest/test_suites/disk"
+	"github.com/GoogleCloudPlatform/guest-test-infra/imagetest/test_suites/hostnamevalidation"
 	"github.com/GoogleCloudPlatform/guest-test-infra/imagetest/test_suites/hotattach"
 	"github.com/GoogleCloudPlatform/guest-test-infra/imagetest/test_suites/imageboot"
-	"github.com/GoogleCloudPlatform/guest-test-infra/imagetest/test_suites/imagevalidation"
 	"github.com/GoogleCloudPlatform/guest-test-infra/imagetest/test_suites/metadata"
 	"github.com/GoogleCloudPlatform/guest-test-infra/imagetest/test_suites/network"
 	"github.com/GoogleCloudPlatform/guest-test-infra/imagetest/test_suites/networkperf"
 	"github.com/GoogleCloudPlatform/guest-test-infra/imagetest/test_suites/oslogin"
+	"github.com/GoogleCloudPlatform/guest-test-infra/imagetest/test_suites/packagevalidation"
 	"github.com/GoogleCloudPlatform/guest-test-infra/imagetest/test_suites/security"
 	"github.com/GoogleCloudPlatform/guest-test-infra/imagetest/test_suites/shapevalidation"
 	"github.com/GoogleCloudPlatform/guest-test-infra/imagetest/test_suites/sql"
@@ -139,8 +140,8 @@ func main() {
 			networkperf.TestSetup,
 		},
 		{
-			imagevalidation.Name,
-			imagevalidation.TestSetup,
+			hostnamevalidation.Name,
+			hostnamevalidation.TestSetup,
 		},
 		{
 			imageboot.Name,
@@ -166,6 +167,10 @@ func main() {
 			shapevalidation.Name,
 			shapevalidation.TestSetup,
 		},
+		{
+			packagevalidation.Name,
+			packagevalidation.TestSetup,
+		},
 		{
 			storageperf.Name,
 			storageperf.TestSetup,

diff --git a/.../imagevalidation/image_validation_test.go → ...amevalidation/hostname_validation_test.go b/.../imagevalidation/image_validation_test.go → ...amevalidation/hostname_validation_test.go
@@ -1,7 +1,7 @@
 //go:build cit
 // +build cit
 
-package imagevalidation
+package hostnamevalidation
 
 import (
 	"crypto/md5"

diff --git a/...tes/imagevalidation/linux_license_test.go → .../hostnamevalidation/linux_license_test.go b/...tes/imagevalidation/linux_license_test.go → .../hostnamevalidation/linux_license_test.go
@@ -1,7 +1,7 @@
 //go:build cit
 // +build cit
 
-package imagevalidation
+package hostnamevalidation
 
 import (
 	"testing"

diff --git a/...test/test_suites/imagevalidation/setup.go → ...t/test_suites/hostnamevalidation/setup.go b/...test/test_suites/imagevalidation/setup.go → ...t/test_suites/hostnamevalidation/setup.go
@@ -1,17 +1,17 @@
-package imagevalidation
+package hostnamevalidation
 
 import "github.com/GoogleCloudPlatform/guest-test-infra/imagetest"
 
 // Name is the name of the test package. It must match the directory name.
-var Name = "imagevalidation"
+var Name = "hostnamevalidation"
 
 // TestSetup sets up the test workflow.
 func TestSetup(t *imagetest.TestWorkflow) error {
 	vm1, err := t.CreateTestVM("vm1")
 	if err != nil {
 		return err
 	}
-	vm1.RunTests("TestHostname|TestFQDN|TestHostKeysGeneratedOnce|TestArePackagesLegal|TestStandardPrograms|TestGuestPackages|TestNTPService|TestHostsFile")
+	vm1.RunTests("TestHostname|TestFQDN|TestHostKeysGeneratedOnce|TestHostsFile")
 
 	vm2, err := t.CreateTestVM("vm2.custom.domain")
 	if err != nil {

diff --git a/...test_suites/imagevalidation/clock_test.go → ...st_suites/packagevalidation/clock_test.go b/...test_suites/imagevalidation/clock_test.go → ...st_suites/packagevalidation/clock_test.go
@@ -1,7 +1,7 @@
 //go:build cit
 // +build cit
 
-package imagevalidation
+package packagevalidation
 
 import (
 	"os/exec"

diff --git a/...st_suites/imagevalidation/license_test.go → ..._suites/packagevalidation/license_test.go b/...st_suites/imagevalidation/license_test.go → ..._suites/packagevalidation/license_test.go
@@ -1,7 +1,7 @@
 //go:build cit
 // +build cit
 
-package imagevalidation
+package packagevalidation
 
 import (
 	"fmt"

diff --git a/...st_suites/imagevalidation/package_test.go → ..._suites/packagevalidation/package_test.go b/...st_suites/imagevalidation/package_test.go → ..._suites/packagevalidation/package_test.go
@@ -1,7 +1,7 @@
 //go:build cit
 // +build cit
 
-package imagevalidation
+package packagevalidation
 
 import (
 	"bytes"

diff --git a/imagetest/test_suites/packagevalidation/setup.go b/imagetest/test_suites/packagevalidation/setup.go
@@ -0,0 +1,17 @@
+package packagevalidation
+
+import "github.com/GoogleCloudPlatform/guest-test-infra/imagetest"
+
+// Name is the name of the test package. It must match the directory name.
+var Name = "packagevalidation"
+
+// TestSetup sets up the test workflow.
+func TestSetup(t *imagetest.TestWorkflow) error {
+	vm1, err := t.CreateTestVM("vm1")
+	if err != nil {
+		return err
+	}
+	vm1.RunTests("TestArePackagesLegal|TestStandardPrograms|TestGuestPackages|TestNTPService")
+
+	return nil
+}