pkg/mgrconfig: make dashboard_key unnecessary

Update mgrconfig tests so that they properly test manager configuration.

Add dummy files to the testdata directory so that it looks like a real
syzkaller folder.

Adjust gce1.cfg to test the situation when there dashboard_client is not
accompanied by dashboard_key.

Make dashboard_key unnecessary.

13 files changed, 9 insertions, 11 deletions

diff --git a/pkg/mgrconfig/load.go b/pkg/mgrconfig/load.go
index e021b69fe..b16e72540 100644
--- a/pkg/mgrconfig/load.go
+++ b/pkg/mgrconfig/load.go
@@ -164,7 +164,6 @@ func Complete(cfg *Config) error {
 		if err := checkNonEmpty(
 			cfg.Name, "name",
 			cfg.DashboardAddr, "dashboard_addr",
-			cfg.DashboardKey, "dashboard_key",
 		); err != nil {
 			return err
 		}
diff --git a/pkg/mgrconfig/mgrconfig_test.go b/pkg/mgrconfig/mgrconfig_test.go
index 3b4d9cc7d..dd3060d5f 100644
--- a/pkg/mgrconfig/mgrconfig_test.go
+++ b/pkg/mgrconfig/mgrconfig_test.go
@@ -20,8 +20,8 @@ func TestCanned(t *testing.T) {
 	}
 	for _, file := range files {
 		t.Run(file, func(t *testing.T) {
-			cfg := new(Config)
-			if err := config.LoadFile(file, cfg); err != nil {
+			cfg, err := LoadFile(file)
+			if err != nil {
 				t.Fatal(err)
 			}
 			var vmCfg interface{}
diff --git a/pkg/mgrconfig/testdata/disk.raw b/pkg/mgrconfig/testdata/disk.raw
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/pkg/mgrconfig/testdata/disk.raw
diff --git a/pkg/mgrconfig/testdata/gce1.cfg b/pkg/mgrconfig/testdata/gce1.cfg
index 805a1f418..63320cd93 100644
--- a/pkg/mgrconfig/testdata/gce1.cfg
+++ b/pkg/mgrconfig/testdata/gce1.cfg
@@ -5,11 +5,12 @@
 	"target": "windows/amd64",
 	"http": ":10000",
 	"workdir": "/workdir",
-	"syzkaller": "/syzkaller",
-	"sshkey": "/syzkaller_id_rsa",
+	"syzkaller": "./testdata/syzkaller",
 	"ssh_user": "syzkaller",
 	"procs": 8,
 	"type": "gce",
+	"dashboard_client": "client",
+	"dashboard_addr": "127.0.0.1",
 	"vm": {
 		"count": 10,
 		"machine_type": "n1-highcpu-2",
diff --git a/pkg/mgrconfig/testdata/gce2.cfg b/pkg/mgrconfig/testdata/gce2.cfg
index cf9a620f2..40ef21272 100644
--- a/pkg/mgrconfig/testdata/gce2.cfg
+++ b/pkg/mgrconfig/testdata/gce2.cfg
@@ -3,9 +3,8 @@
 	"target": "linux/amd64",
 	"http": ":10000",
 	"workdir": "/workdir",
-	"syzkaller": "/syzkaller",
-	"image": "/local/path/to/disk.raw",
-	"sshkey": "/syzkaller_id_rsa",
+	"syzkaller": "./testdata/syzkaller",
+	"image": "./testdata/disk.raw",
 	"ssh_user": "syzkaller",
 	"procs": 8,
 	"type": "gce",
diff --git a/pkg/mgrconfig/testdata/qemu.cfg b/pkg/mgrconfig/testdata/qemu.cfg
index f390537fd..c86ecf6aa 100644
--- a/pkg/mgrconfig/testdata/qemu.cfg
+++ b/pkg/mgrconfig/testdata/qemu.cfg
@@ -3,9 +3,8 @@
 	"http": "myhost.com:56741",
 	"workdir": "/syzkaller/workdir",
 	"kernel_obj": "/linux/",
-	"image": "/linux_image/wheezy.img",
-	"sshkey": "/linux_image/ssh/id_rsa",
-	"syzkaller": "/syzkaller",
+	"image": "./testdata/wheezy.img",
+	"syzkaller": "./testdata/syzkaller",
 	"disable_syscalls": ["keyctl", "add_key", "request_key"],
 	"suppressions": ["some known bug"],
 	"procs": 4,
diff --git a/pkg/mgrconfig/testdata/syzkaller/bin/linux_amd64/syz-execprog b/pkg/mgrconfig/testdata/syzkaller/bin/linux_amd64/syz-execprog
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/pkg/mgrconfig/testdata/syzkaller/bin/linux_amd64/syz-execprog
diff --git a/pkg/mgrconfig/testdata/syzkaller/bin/linux_amd64/syz-executor b/pkg/mgrconfig/testdata/syzkaller/bin/linux_amd64/syz-executor
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/pkg/mgrconfig/testdata/syzkaller/bin/linux_amd64/syz-executor
diff --git a/pkg/mgrconfig/testdata/syzkaller/bin/linux_amd64/syz-fuzzer b/pkg/mgrconfig/testdata/syzkaller/bin/linux_amd64/syz-fuzzer
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/pkg/mgrconfig/testdata/syzkaller/bin/linux_amd64/syz-fuzzer
diff --git a/pkg/mgrconfig/testdata/syzkaller/bin/windows_amd64/syz-execprog.exe b/pkg/mgrconfig/testdata/syzkaller/bin/windows_amd64/syz-execprog.exe
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/pkg/mgrconfig/testdata/syzkaller/bin/windows_amd64/syz-execprog.exe
diff --git a/pkg/mgrconfig/testdata/syzkaller/bin/windows_amd64/syz-executor.exe b/pkg/mgrconfig/testdata/syzkaller/bin/windows_amd64/syz-executor.exe
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/pkg/mgrconfig/testdata/syzkaller/bin/windows_amd64/syz-executor.exe
diff --git a/pkg/mgrconfig/testdata/syzkaller/bin/windows_amd64/syz-fuzzer.exe b/pkg/mgrconfig/testdata/syzkaller/bin/windows_amd64/syz-fuzzer.exe
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/pkg/mgrconfig/testdata/syzkaller/bin/windows_amd64/syz-fuzzer.exe
diff --git a/pkg/mgrconfig/testdata/wheezy.img b/pkg/mgrconfig/testdata/wheezy.img
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/pkg/mgrconfig/testdata/wheezy.img