Skip to content

Commit

Permalink
test(core): Fix tests that break with groovy upgrade (#390)
Browse files Browse the repository at this point in the history 
A few of the rosco tests fail when we upgrade groovy because
groovy no longer considers objects equal they are identical
except that a field is null in one vs empty array in the other.

That was masking the fact that we weren't stubbing out the
getMaskedPackerParameters function on our mock CloudProviderBakeHandler.
Add in that stubbing, and also change the calling code to use the
actual accessor rather than the groovy-generated synthetic one.

There's probably a way to factor out some of the common logic in the
tests so changes like this don't need to touch as many lines, but
for now just making the required change in each test.
  • Loading branch information
@ezimanyi @maggieneterval
ezimanyi authored and maggieneterval committed Jun 24, 2019
1 parent c0b17b0 commit 276152c
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 11 deletions.
2 changes: 1 addition & 1 deletion rosco-web/src/main/groovy/com/netflix/spinnaker/rosco/controllers/BakeryController.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ class BakeryController {

def bakeRecipe = cloudProviderBakeHandler.produceBakeRecipe(region, bakeRequest)
def jobRequest = new JobRequest(tokenizedCommand: bakeRecipe.command,
maskedParameters: cloudProviderBakeHandler.maskedPackerParameters,
maskedParameters: cloudProviderBakeHandler.getMaskedPackerParameters(),
jobId: bakeRequest.request_id,
executionId: bakeRequest.spinnaker_execution_id)

Expand Down
40 changes: 30 additions & 10 deletions ...o-web/src/test/groovy/com/netflix/spinnaker/rosco/controllers/BakeryControllerSpec.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ class BakeryControllerSpec extends Specification {
setup:
def registry = new DefaultRegistry()
def cloudProviderBakeHandlerRegistryMock = Mock(CloudProviderBakeHandlerRegistry)
def cloudProviderBakeHandlerMock = Mock(CloudProviderBakeHandler)
def cloudProviderBakeHandlerMock = Mock(CloudProviderBakeHandler) {
getMaskedPackerParameters() >> []
}
def bakeStoreMock = Mock(RedisBackedBakeStore)
def jobExecutorMock = Mock(JobExecutor)
def bakeRequest = new BakeRequest(user: "someuser@gmail.com",
Expand Down Expand Up @@ -87,7 +89,9 @@ class BakeryControllerSpec extends Specification {
setup:
def registry = new DefaultRegistry()
def cloudProviderBakeHandlerRegistryMock = Mock(CloudProviderBakeHandlerRegistry)
def cloudProviderBakeHandlerMock = Mock(CloudProviderBakeHandler)
def cloudProviderBakeHandlerMock = Mock(CloudProviderBakeHandler) {
getMaskedPackerParameters() >> []
}
def bakeStoreMock = Mock(RedisBackedBakeStore)
def jobExecutorMock = Mock(JobExecutor)
def bakeRequest = new BakeRequest(user: "someuser@gmail.com",
Expand Down Expand Up @@ -130,7 +134,9 @@ class BakeryControllerSpec extends Specification {
setup:
def registry = new DefaultRegistry()
def cloudProviderBakeHandlerRegistryMock = Mock(CloudProviderBakeHandlerRegistry)
def cloudProviderBakeHandlerMock = Mock(CloudProviderBakeHandler)
def cloudProviderBakeHandlerMock = Mock(CloudProviderBakeHandler) {
getMaskedPackerParameters() >> []
}
def bakeStoreMock = Mock(RedisBackedBakeStore)
def bakeRequest = new BakeRequest(user: "someuser@gmail.com",
package_name: PACKAGE_NAME,
Expand Down Expand Up @@ -166,7 +172,9 @@ class BakeryControllerSpec extends Specification {
setup:
def registry = new DefaultRegistry()
def cloudProviderBakeHandlerRegistryMock = Mock(CloudProviderBakeHandlerRegistry)
def cloudProviderBakeHandlerMock = Mock(CloudProviderBakeHandler)
def cloudProviderBakeHandlerMock = Mock(CloudProviderBakeHandler) {
getMaskedPackerParameters() >> []
}
def bakeStoreMock = Mock(RedisBackedBakeStore)
def jobExecutorMock = Mock(JobExecutor)
def bakeRequest = new BakeRequest(user: "someuser@gmail.com",
Expand Down Expand Up @@ -209,7 +217,9 @@ class BakeryControllerSpec extends Specification {
setup:
def registry = new DefaultRegistry()
def cloudProviderBakeHandlerRegistryMock = Mock(CloudProviderBakeHandlerRegistry)
def cloudProviderBakeHandlerMock = Mock(CloudProviderBakeHandler)
def cloudProviderBakeHandlerMock = Mock(CloudProviderBakeHandler) {
getMaskedPackerParameters() >> []
}
def bakeStoreMock = Mock(RedisBackedBakeStore)
def bakeRequest = new BakeRequest(user: "someuser@gmail.com",
package_name: PACKAGE_NAME,
Expand Down Expand Up @@ -268,7 +278,9 @@ class BakeryControllerSpec extends Specification {
setup:
def registry = new DefaultRegistry()
def cloudProviderBakeHandlerRegistryMock = Mock(CloudProviderBakeHandlerRegistry)
def cloudProviderBakeHandlerMock = Mock(CloudProviderBakeHandler)
def cloudProviderBakeHandlerMock = Mock(CloudProviderBakeHandler) {
getMaskedPackerParameters() >> []
}
def bakeStoreMock = Mock(RedisBackedBakeStore)
def bakeRequest = new BakeRequest(user: "someuser@gmail.com",
package_name: PACKAGE_NAME,
Expand Down Expand Up @@ -301,7 +313,9 @@ class BakeryControllerSpec extends Specification {
setup:
def registry = new DefaultRegistry()
def cloudProviderBakeHandlerRegistryMock = Mock(CloudProviderBakeHandlerRegistry)
def cloudProviderBakeHandlerMock = Mock(CloudProviderBakeHandler)
def cloudProviderBakeHandlerMock = Mock(CloudProviderBakeHandler) {
getMaskedPackerParameters() >> []
}
def bakeStoreMock = Mock(RedisBackedBakeStore)
def bakeRequest = new BakeRequest(user: "someuser@gmail.com",
package_name: PACKAGE_NAME,
Expand Down Expand Up @@ -335,7 +349,9 @@ class BakeryControllerSpec extends Specification {
setup:
def registry = new DefaultRegistry()
def cloudProviderBakeHandlerRegistryMock = Mock(CloudProviderBakeHandlerRegistry)
def cloudProviderBakeHandlerMock = Mock(CloudProviderBakeHandler)
def cloudProviderBakeHandlerMock = Mock(CloudProviderBakeHandler) {
getMaskedPackerParameters() >> []
}
def bakeStoreMock = Mock(RedisBackedBakeStore)
def jobExecutorMock = Mock(JobExecutor)
def bakeRequest = new BakeRequest(user: "someuser@gmail.com",
Expand Down Expand Up @@ -379,7 +395,9 @@ class BakeryControllerSpec extends Specification {
setup:
def registry = new DefaultRegistry()
def cloudProviderBakeHandlerRegistryMock = Mock(CloudProviderBakeHandlerRegistry)
def cloudProviderBakeHandlerMock = Mock(CloudProviderBakeHandler)
def cloudProviderBakeHandlerMock = Mock(CloudProviderBakeHandler) {
getMaskedPackerParameters() >> []
}
def bakeStoreMock = Mock(RedisBackedBakeStore)
def jobExecutorMock = Mock(JobExecutor)
def bakeRequest = new BakeRequest(user: "someuser@gmail.com",
Expand Down Expand Up @@ -420,7 +438,9 @@ class BakeryControllerSpec extends Specification {
setup:
def registry = new DefaultRegistry()
def cloudProviderBakeHandlerRegistryMock = Mock(CloudProviderBakeHandlerRegistry)
def cloudProviderBakeHandlerMock = Mock(CloudProviderBakeHandler)
def cloudProviderBakeHandlerMock = Mock(CloudProviderBakeHandler) {
getMaskedPackerParameters() >> []
}
def bakeStoreMock = Mock(RedisBackedBakeStore)
def jobExecutorMock = Mock(JobExecutor)
def bakeRequest = new BakeRequest(user: "someuser@gmail.com",
Expand Down

0 comments on commit 276152c

Please sign in to comment.