Fix golang 1.11 formatter complaints.

mesos · Mar 15, 2019 · f68390e · f68390e
1 parent 9706270
commit f68390e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/api/v1/lib/resources_test.go b/api/v1/lib/resources_test.go
@@ -762,10 +762,10 @@ func TestReservedResources_Validation(t *testing.T) {
 		if tc.wantsErr != (err != nil) {
 			if tc.wantsErr {
 				// expected failure
-				t.Errorf("test case %d failed: expected validation failure for %q", ti, tc.r)
+				t.Errorf("test case %d failed: expected validation failure for %v", ti, tc.r)
 			} else {
 				// unexpected failure
-				t.Errorf("test case %d failed: unexpected validation error for %q: %+v", ti, tc.r, err)
+				t.Errorf("test case %d failed: unexpected validation error for %v: %+v", ti, tc.r, err)
 			}
 		}
 	}
@@ -828,7 +828,7 @@ func TestReservedResources_Equivalence(t *testing.T) {
 				continue
 			}
 			if left.Equivalent(unique[j]) {
-				t.Errorf("unexpected equivalence for resources: %q and %q", left, unique[j])
+				t.Errorf("unexpected equivalence for resources: %v and %v", left, unique[j])
 			}
 		}
 	}

diff --git a/api/v1/lib/scheduler/operations/operations.go b/api/v1/lib/scheduler/operations/operations.go
@@ -233,7 +233,7 @@ func opDestroy(operation *mesos.Offer_Operation, resources mesos.Resources, conv
 
 		if rez.Contains(result, volumes[i]) {
 			return nil, fmt.Errorf(
-				"persistent volume %q cannot be removed due to additional shared copies", volumes[i])
+				"persistent volume %v cannot be removed due to additional shared copies", volumes[i])
 		}
 
 		// Strip the disk info so that we can subtract it from the
@@ -267,7 +267,7 @@ func opGrowVolume(operation *mesos.Offer_Operation, resources mesos.Resources, c
 	}
 
 	if !rez.ContainsAll(result, consumed) {
-		return nil, fmt.Errorf("%q does not contain %q", result, consumed)
+		return nil, fmt.Errorf("%v does not contain %v", result, consumed)
 	}
 
 	result.Subtract(consumed...)
@@ -285,7 +285,7 @@ func opShrinkVolume(operation *mesos.Offer_Operation, resources mesos.Resources,
 	consumed := operation.GetShrinkVolume().GetVolume()
 
 	if !rez.Contains(result, consumed) {
-		return nil, fmt.Errorf("%q does not contain %q", result, consumed)
+		return nil, fmt.Errorf("%v does not contain %v", result, consumed)
 	}
 
 	result.Subtract1(consumed)
@@ -303,7 +303,7 @@ func opCreateDisk(operation *mesos.Offer_Operation, resources mesos.Resources, c
 	consumed := operation.GetCreateDisk().GetSource()
 
 	if !rez.Contains(result, consumed) {
-		return nil, fmt.Errorf("%q does not contain %q", result, consumed)
+		return nil, fmt.Errorf("%v does not contain %v", result, consumed)
 	}
 
 	result.Subtract1(consumed)
@@ -319,7 +319,7 @@ func opDestroyDisk(operation *mesos.Offer_Operation, resources mesos.Resources,
 	consumed := operation.GetDestroyDisk().GetSource()
 
 	if !rez.Contains(result, consumed) {
-		return nil, fmt.Errorf("%q does not contain %q", result, consumed)
+		return nil, fmt.Errorf("%v does not contain %v", result, consumed)
 	}
 
 	result.Subtract1(consumed)