Merge pull request #46711 from derekwaynecarr/redundant-if-block

Fix cross-build by having active deadline seconds use maxInt32
This commit is contained in:
Dawn Chen
2017-06-01 17:18:18 -07:00
committed by GitHub
2 changed files with 7 additions and 9 deletions

View File

@@ -3499,7 +3499,7 @@ func TestValidateDNSPolicy(t *testing.T) {
func TestValidatePodSpec(t *testing.T) {
activeDeadlineSeconds := int64(30)
activeDeadlineSecondsMax := int64(math.MaxUint32)
activeDeadlineSecondsMax := int64(math.MaxInt32)
minUserID := types.UnixUserID(0)
maxUserID := types.UnixUserID(2147483647)
@@ -3615,7 +3615,7 @@ func TestValidatePodSpec(t *testing.T) {
}
activeDeadlineSeconds = int64(0)
activeDeadlineSecondsTooLarge := int64(math.MaxUint32 + 1)
activeDeadlineSecondsTooLarge := int64(math.MaxInt32 + 1)
minUserID = types.UnixUserID(-1)
maxUserID = types.UnixUserID(2147483648)