Fix --queues_avoid default not applying (#499)

Author: sb10

Makefile

@@ -37,6 +37,7 @@ test-k8s-unit: compile_k8s_tmp ## Run the unit and integration tests for the kub
 race: export CGO_ENABLED = 1
 race:
 	go test -p 1 -tags netgo -race --count 1 -failfast ./
+	go test -p 1 -tags netgo -race --count 1 -failfast ./cmd
 	go test -p 1 -tags netgo -race --count 1 -failfast ./queue
 	go test -p 1 -tags netgo -race --count 1 -failfast -timeout 30m ./jobqueue
 	go test -p 1 -tags netgo -race --count 1 -failfast -timeout 40m ./jobqueue/scheduler

cmd/add.go

@@ -85,7 +85,7 @@ var (
 	cmdCloudSharedDisk      bool
 	cmdFlavor               string
 	cmdQueue                string
-	cmdQueuesAvoid          string
+	cmdQueuesAvoidAdd       string
 	cmdMisc                 string
 	cmdMonitorDocker        string
 	cmdWithDocker           string
@@ -560,7 +560,7 @@ func init() {
 	addCmd.Flags().StringVar(&cmdCloudConfigs, "cloud_config_files", "", "in the cloud, comma separated paths of config files to copy to servers created to run these commands")
 	addCmd.Flags().BoolVar(&cmdCloudSharedDisk, "cloud_shared", false, "mount /shared")
 	addCmd.Flags().StringVar(&cmdQueue, "queue", "", "name of queue to submit to, for schedulers with queues")
-	addCmd.Flags().StringVar(&cmdQueuesAvoid, "queues_avoid", "interactive",
+	addCmd.Flags().StringVar(&cmdQueuesAvoidAdd, "queues_avoid", "interactive",
 		"comma-separated list of substrings found in queues that should not be submitted to, for schedulers with queues")
 	addCmd.Flags().StringVar(&cmdMisc, "misc", "", "miscellaneous options to pass through to scheduler when submitting")
 	addCmd.Flags().StringVar(&cmdEnv, "env", "", "comma-separated list of key=value environment variables to set before running the commands")
@@ -651,7 +651,7 @@ func parseCmdFile(jq *jobqueue.Client, diskSet bool) ([]*jobqueue.Job, bool, boo
 		CloudFlavor:          cmdFlavor,
 		CloudShared:          cmdCloudSharedDisk,
 		SchedulerQueue:       cmdQueue,
-		SchedulerQueuesAvoid: cmdQueuesAvoid,
+		SchedulerQueuesAvoid: cmdQueuesAvoidAdd,
 		SchedulerMisc:        cmdMisc,
 		BsubMode:             bsubMode,
 		RTimeout:             rtimeoutint,

cmd/add_test.go

@@ -0,0 +1,34 @@
+// Copyright © 2016-2021,2024,2025 Genome Research Limited
+// Author: Sendu Bala <sb10@sanger.ac.uk>.
+//
+//  This file is part of wr.
+//
+//  wr is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  wr is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with wr. If not, see <http://www.gnu.org/licenses/>.
+
+package cmd
+
+import (
+	"testing"
+
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestAddQueuesAvoidDefault(t *testing.T) {
+	Convey("add queues_avoid default is applied when unset", t, func() {
+		flag := addCmd.Flags().Lookup("queues_avoid")
+		So(flag, ShouldNotBeNil)
+		So(flag.Value.String(), ShouldEqual, "interactive")
+		So(cmdQueuesAvoidAdd, ShouldEqual, "interactive")
+	})
+}

cmd/mod.go

@@ -37,6 +37,7 @@ var (
 	cmdCwdMattersUnset      bool
 	cmdChangeHomeUnset      bool
 	cmdCloudSharedDiskUnset bool
+	cmdQueuesAvoidMod       string
 )
 
 const nothingBehaviour = `[{"Nothing":true}]`
@@ -245,8 +246,8 @@ new internal ids is printed.`,
 		if cmdQueue != "" {
 			other["scheduler_queue"] = cmdQueue
 		}
-		if cmdQueuesAvoid != "" {
-			other["scheduler_queues_avoid"] = cmdQueuesAvoid
+		if cmdQueuesAvoidMod != "" {
+			other["scheduler_queues_avoid"] = cmdQueuesAvoidMod
 		}
 		if len(other) > 0 || otherSet {
 			req.Other = other
@@ -423,7 +424,7 @@ func init() {
 	modCmd.Flags().BoolVar(&cmdCloudSharedDiskUnset, "unset_cloud_shared", false, "unset --cloud_shared")
 	modCmd.Flags().StringVar(&cmdEnv, "env", "", "comma-separated list of key=value environment variables to set before running the commands")
 	modCmd.Flags().StringVar(&cmdQueue, "queue", "", "name of queue to submit to, for schedulers with queues")
-	modCmd.Flags().StringVar(&cmdQueuesAvoid, "queues_avoid", "",
+	modCmd.Flags().StringVar(&cmdQueuesAvoidMod, "queues_avoid", "",
 		"comma-separated list of substrings found in queues that should not be submitted to, for schedulers with queues")
 	// modCmd.Flags().BoolVar(&cmdBsubMode, "bsub", false, "enable bsub emulation mode")