Skip to content

Commit

Permalink
Merge pull request #3366 from gjtempleton/cluster-autoscaler-release-…
Browse files Browse the repository at this point in the history
…1.15-AWS-Failing-Test-Fix

Cluster-Autoscaler - Resolve Failing AWS tests
  • Loading branch information
k8s-ci-robot authored Jul 30, 2020
2 parents afce3ea + 53d6b53 commit df34fdd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions cluster-autoscaler/cloudprovider/aws/aws_manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ func TestFetchExplicitAsgs(t *testing.T) {
defer resetAWSRegion(os.LookupEnv("AWS_REGION"))
os.Setenv("AWS_REGION", "fanghorn")
instanceTypes, _ := GetStaticEC2InstanceTypes()
m, err := createAWSManagerInternal(nil, do, &autoScalingWrapper{s, newLaunchConfigurationInstanceTypeCache()}, nil, instanceTypes)
m, err := createAWSManagerInternal(nil, do, &autoScalingWrapper{s, map[string]string{}}, nil, instanceTypes)
assert.NoError(t, err)

asgs := m.asgCache.Get()
Expand Down Expand Up @@ -541,7 +541,7 @@ func TestFetchAutoAsgs(t *testing.T) {
os.Setenv("AWS_REGION", "fanghorn")
// fetchAutoASGs is called at manager creation time, via forceRefresh
instanceTypes, _ := GetStaticEC2InstanceTypes()
m, err := createAWSManagerInternal(nil, do, &autoScalingWrapper{s, newLaunchConfigurationInstanceTypeCache()}, nil, instanceTypes)
m, err := createAWSManagerInternal(nil, do, &autoScalingWrapper{s, map[string]string{}}, nil, instanceTypes)
assert.NoError(t, err)

asgs := m.asgCache.Get()
Expand Down

0 comments on commit df34fdd

Please sign in to comment.