Fix sudo appearing in touchSentinel command (#91)

Add tests for sudo being true or false in multi partial commands

Change test scheduler to include wrstat executable name and sudo.

Co-authored-by: Rosie Kern <[email protected]>

cmd/cron.go

@@ -83,7 +83,7 @@ invocations of cron, do 'sudo wrstsat cron --kill'.
 
 		taskr := tasker.New(tasker.Option{})
 		taskr.Task(crontab, func(ctx context.Context) (int, error) {
-			err := doMultiScheduling(args)
+			err := doMultiScheduling(args, sudo)
 
 			if runJobs != "" {
 				os.Exit(0)

cmd/multi.go

@@ -142,7 +142,7 @@ exists, and you have a wrstat server using the database files inside, the server
 will automatically start using the new data and delete the old.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		checkMultiArgs(args)
-		err := doMultiScheduling(args)
+		err := doMultiScheduling(args, sudo)
 		if err != nil {
 			die("%s", err)
 		}
@@ -203,8 +203,8 @@ func checkStandardFlags() {
 }
 
 // doMultiScheduling does the main work of the multi sub-command.
-func doMultiScheduling(args []string) error {
-	s, d := newScheduler(workDir, forcedQueue)
+func doMultiScheduling(args []string, sudo bool) error {
+	s, d := newScheduler(workDir, forcedQueue, sudo)
 	defer d()
 
 	unique := scheduler.UniqueString()
@@ -218,12 +218,11 @@ func doMultiScheduling(args []string) error {
 	scheduleWalkJobs(outputRoot, args, unique, multiStatJobs, multiInodes, multiCh, forcedQueue, s)
 
 	if partialDirMerge != "" {
-		s.DisableSudo()
-
 		unique = scheduleStaticCopy(outputRoot, unique, partialDirMerge, partialDirClean, s)
 	}
 
 	if createPartial {
+		s.DisableSudo()
 		schedulePartialSentinel(outputRoot, unique, s)
 
 		return nil

cmd/root.go

@@ -146,16 +146,20 @@ func die(msg string, a ...interface{}) {
 // function you should defer.
 //
 // If you provide a non-blank queue, that queue will be used when scheduling.
-func newScheduler(cwd, queue string) (*scheduler.Scheduler, func()) {
+func newScheduler(cwd, queue string, sudo bool) (*scheduler.Scheduler, func()) {
 	if runJobs != "" {
-		return testScheduler()
+		return testScheduler(sudo)
 	}
 
-	s, err := scheduler.New(deployment, cwd, queue, connectTimeout, appLogger, sudo)
+	s, err := scheduler.New(deployment, cwd, queue, connectTimeout, appLogger)
 	if err != nil {
 		die("%s", err)
 	}
 
+	if sudo {
+		s.EnableSudo()
+	}
+
 	return s, func() {
 		err = s.Disconnect()
 		if err != nil {
@@ -199,6 +203,11 @@ func testPrint(jobs []*jobqueue.Job) {
 	json.NewEncoder(w).Encode(jobs) //nolint:errcheck,errchkjson
 }
 
-func testScheduler() (*scheduler.Scheduler, func()) {
-	return &scheduler.Scheduler{}, func() {}
+func testScheduler(sudo bool) (*scheduler.Scheduler, func()) {
+	s := &scheduler.Scheduler{}
+	if sudo {
+		s.EnableSudo()
+	}
+
+	return s, func() {}
 }

cmd/walk.go

@@ -89,7 +89,7 @@ your own job that depends on that group, such as a 'wrstat combine' call).`,
 	Run: func(cmd *cobra.Command, args []string) {
 		desiredDir := checkArgs(outputDir, depGroup, args)
 
-		s, d := newScheduler("", forcedQueue)
+		s, d := newScheduler("", forcedQueue, sudo)
 		defer d()
 
 		if walkID == "" {