ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13772 from hashicorp/p-aws-multi-zone-instance 

Fixing TestAccAWSInstance_multipleRegions
This commit is contained in:
Matthew Frahry 2017-04-19 14:32:43 -06:00 committed by GitHub
parent f5df4422ae 1608f5544f
commit 07c0f95563
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
helper/resource/testing.go
View File

@ -354,26 +354,23 @@ func Test(t TestT, c TestCase) {
// Any errors are stored so that they can be returned by the factory in
// terraform to match non-test behavior.
func testProviderFactories(c TestCase) (map[string]terraform.ResourceProviderFactory, error) {
ctxProviders := make(map[string]terraform.ResourceProviderFactory)
ctxProviders := c.ProviderFactories // make(map[string]terraform.ResourceProviderFactory)
if ctxProviders == nil {
ctxProviders = make(map[string]terraform.ResourceProviderFactory)
}
// add any fixed providers
for k, p := range c.Providers {
ctxProviders[k] = terraform.ResourceProviderFactoryFixed(p)
}
// call any factory functions and store the result.
for k, pf := range c.ProviderFactories {
p, err := pf()
ctxProviders[k] = func() (terraform.ResourceProvider, error) {
return p, err
}
}
// reset the providers if needed
for k, pf := range ctxProviders {
// we can ignore any errors here, if we don't have a provider to reset
// the error will be handled later
p, _ := pf()
p, err := pf()
if err != nil {
return nil, err
}
if p, ok := p.(TestProvider); ok {
err := p.TestReset()
if err != nil {