minor test case polishing

Author: HouzuoGuo

daemon/httpd/handler/file_upload.go

@@ -125,12 +125,12 @@ func (upload *HandleFileUpload) Handle(w http.ResponseWriter, r *http.Request) {
 		// Generate a temporary file that preserves extension name of the original
 		tmpFileName := hex.EncodeToString(randName) + filepath.Ext(fileHeader.Filename)
 		if err := os.MkdirAll(fileUploadStorage, 0700); err != nil {
-			http.Error(w, `failed to store file`, http.StatusInternalServerError)
+			http.Error(w, fmt.Sprintf("failed to store file: %v", err), http.StatusInternalServerError)
 			return
 		}
 		tmpFile, err := os.OpenFile(filepath.Join(fileUploadStorage, tmpFileName), os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0600)
 		if err != nil {
-			http.Error(w, `failed to store file`, http.StatusInternalServerError)
+			http.Error(w, fmt.Sprintf("failed to store file: %v", err), http.StatusInternalServerError)
 			return
 		}
 		defer tmpFile.Close()

daemon/httpd/httpd.go

@@ -28,6 +28,7 @@ import (
 	"github.com/HouzuoGuo/laitos/testingstub"
 	"github.com/HouzuoGuo/laitos/toolbox"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/stretchr/testify/assert"
 )
 
 const (
@@ -401,9 +402,8 @@ func TestAPIHandlers(httpd *Daemon, t testingstub.T) {
 		ContentType: fileUploadRequestWriter.FormDataContentType(),
 		Body:        fileUploadRequestBody,
 	}, addr+"/upload")
-	if err != nil || resp.StatusCode != http.StatusOK {
-		t.Fatal(err, resp, string(resp.Body))
-	}
+	assert.NoError(t, err)
+	assert.Equal(t, http.StatusOK, resp.StatusCode)
 	// File upload - download
 	var downloadFileName string
 	for _, line := range strings.Split(string(resp.Body), "\n") {

daemon/maintenance/maintenance.go

@@ -91,12 +91,12 @@ type Daemon struct {
 		IntervalSec determines the rate of execution of maintenance routine. This is not a sleep duration. The constant
 		rate of execution is maintained by taking away routine's elapsed time from actual interval between runs.
 	*/
-	IntervalSec         int                     `json:"IntervalSec"`
-	MailClient          inet.MailClient         `json:"MailClient"` // Send notification mails via this mailer
-	Recipients          []string                `json:"Recipients"` // Address of recipients of notification mails
-	FeaturesToTest      *toolbox.FeatureSet     `json:"-"`          // FeaturesToTest are toolbox features to be tested during health check.
-	MailCmdRunnerToTest *mailcmd.CommandRunner  `json:"-"`          // MailCmdRunnerToTest is mail command runner to be tested during health check.
-	HTTPHandlersToCheck httpd.HandlerCollection `json:"-"`          // HTTPHandlersToCheck are the URL handlers of an HTTP daemon to be tested during health check.
+	IntervalSec               int                     `json:"IntervalSec"`
+	MailClient                inet.MailClient         `json:"MailClient"` // Send notification mails via this mailer
+	Recipients                []string                `json:"Recipients"` // Address of recipients of notification mails
+	ToolboxSelfTest           *toolbox.FeatureSet     `json:"-"`          // FeaturesToTest are toolbox features to be tested during health check.
+	MailCommandRunnerSelfTest *mailcmd.CommandRunner  `json:"-"`          // MailCmdRunnerToTest is mail command runner to be tested during health check.
+	HttpHandlersSelfTest      httpd.HandlerCollection `json:"-"`          // HTTPHandlersToCheck are the URL handlers of an HTTP daemon to be tested during health check.
 
 	// UploadReportToS3Bucket is the name of S3 bucket into which the maintenance daemon shall upload its summary reports.
 	UploadReportToS3Bucket string `json:"UploadReportToS3Bucket"`
@@ -161,22 +161,22 @@ func (daemon *Daemon) Execute(ctx context.Context) (string, bool) {
 	}()
 	go func() {
 		// Toolbox feature self test - the routine itself also uses concurrency internally
-		if daemon.FeaturesToTest != nil {
-			featureErr = daemon.FeaturesToTest.SelfTest()
+		if daemon.ToolboxSelfTest != nil {
+			featureErr = daemon.ToolboxSelfTest.SelfTest()
 		}
 		waitAllChecks.Done()
 	}()
 	go func() {
 		// Mail command runner test - the routine itself also uses concurrency internally
-		if daemon.MailCmdRunnerToTest != nil && daemon.MailCmdRunnerToTest.ReplyMailClient.IsConfigured() {
-			mailCmdRunnerErr = daemon.MailCmdRunnerToTest.SelfTest()
+		if daemon.MailCommandRunnerSelfTest != nil && daemon.MailCommandRunnerSelfTest.ReplyMailClient.IsConfigured() {
+			mailCmdRunnerErr = daemon.MailCommandRunnerSelfTest.SelfTest()
 		}
 		waitAllChecks.Done()
 	}()
 	go func() {
 		// HTTP special handler test - the routine itself also uses concurrency internally
-		if daemon.HTTPHandlersToCheck != nil {
-			httpHandlersErr = daemon.HTTPHandlersToCheck.SelfTest()
+		if daemon.HttpHandlersSelfTest != nil {
+			httpHandlersErr = daemon.HttpHandlersSelfTest.SelfTest()
 		}
 		waitAllChecks.Done()
 	}()
@@ -440,7 +440,7 @@ func TestMaintenance(check *Daemon, t testingstub.T) {
 		t.Fatal("did not run pre script")
 	}
 	// Break a feature
-	check.FeaturesToTest.LookupByTrigger[".s"] = &toolbox.Shell{}
+	check.ToolboxSelfTest.LookupByTrigger[".s"] = &toolbox.Shell{}
 	if result, ok := check.Execute(context.Background()); ok || !strings.Contains(result, "Shell.SelfTest") { // broken shell configuration
 		t.Fatal(result)
 	}
@@ -450,7 +450,7 @@ func TestMaintenance(check *Daemon, t testingstub.T) {
 	} else if !strings.Contains(string(content), "Shell.SelfTest") { // broken shell configuration
 		t.Fatal(string(content))
 	}
-	check.FeaturesToTest.LookupByTrigger[".s"] = &toolbox.Shell{
+	check.ToolboxSelfTest.LookupByTrigger[".s"] = &toolbox.Shell{
 		Unrestricted:    true,
 		InterpreterPath: "/bin/bash",
 	}

daemon/maintenance/maintenance_test.go

@@ -10,18 +10,18 @@ import (
 func TestMaintenance_Execute(t *testing.T) {
 	features := toolbox.GetTestCommandProcessor().Features
 	maint := Daemon{
-		BlockSystemLoginExcept: []string{"root", "howard"},
-		EnableStartServices:    []string{"does-not-exist"},
-		DisableStopServices:    []string{"does-not-exist"},
-		InstallPackages:        []string{"htop"},
-		SetTimeZone:            "UTC",
-		TuneLinux:              true,
-		DoEnhanceFileSecurity:  true,
-		SwapFileSizeMB:         100,
-		FeaturesToTest:         features,
-		ScriptForUnix:          "touch /tmp/laitos-maintenance-pre-script-test",
-		MailCmdRunnerToTest:    nil, // deliberately nil because it is not involved in this test
-		HTTPHandlersToCheck:    nil, // deliberately nil because it is not involved in this test
+		BlockSystemLoginExcept:    []string{"root", "howard"},
+		EnableStartServices:       []string{"does-not-exist"},
+		DisableStopServices:       []string{"does-not-exist"},
+		InstallPackages:           []string{"htop"},
+		SetTimeZone:               "UTC",
+		TuneLinux:                 true,
+		DoEnhanceFileSecurity:     true,
+		SwapFileSizeMB:            100,
+		ToolboxSelfTest:           features,
+		ScriptForUnix:             "touch /tmp/laitos-maintenance-pre-script-test",
+		MailCommandRunnerSelfTest: nil, // deliberately nil because it is not involved in this test
+		HttpHandlersSelfTest:      nil, // deliberately nil because it is not involved in this test
 	}
 
 	// Test default settings

launcher/config.go

@@ -389,10 +389,10 @@ func (config *Config) GetSimpleIPSvcD() *simpleipsvcd.Daemon {
 // GetMaintenance constructs a system maintenance / health check daemon from configuration and return.
 func (config *Config) GetMaintenance() *maintenance.Daemon {
 	config.maintenanceInit.Do(func() {
-		config.Maintenance.FeaturesToTest = config.Features
+		config.Maintenance.ToolboxSelfTest = config.Features
 		config.Maintenance.MailClient = config.MailClient
-		config.Maintenance.MailCmdRunnerToTest = config.GetMailCommandRunner()
-		config.Maintenance.HTTPHandlersToCheck = config.GetHTTPD().HandlerCollection
+		config.Maintenance.MailCommandRunnerSelfTest = config.GetMailCommandRunner()
+		config.Maintenance.HttpHandlersSelfTest = config.GetHTTPD().HandlerCollection
 		if err := config.Maintenance.Initialise(); err != nil {
 			config.logger.Abort("", err, "the daemon failed to initialise")
 			return