Skip to content

Commit

Permalink
Use rev for revision variables everywhere (knative#200)
Browse files Browse the repository at this point in the history
  • Loading branch information
grantr authored Feb 21, 2018
1 parent 4bebaa9 commit dafce6e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions pkg/controller/configuration/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -186,14 +186,14 @@ func TestCreateConfigurationCreatesBuildAndPR(t *testing.T) {
})

h.OnCreate(&elaClient.Fake, "revisions", func(obj runtime.Object) hooks.HookResult {
hr := obj.(*v1alpha1.Revision)
glog.Infof("checking revision %s", hr.Name)
if config.Spec.Template.Spec.Service != hr.Spec.Service {
t.Errorf("hr service was not %s", config.Spec.Template.Spec.Service)
rev := obj.(*v1alpha1.Revision)
glog.Infof("checking revision %s", rev.Name)
if config.Spec.Template.Spec.Service != rev.Spec.Service {
t.Errorf("rev service was not %s", config.Spec.Template.Spec.Service)
}
// TODO(mattmoor): The fake doesn't properly support GenerateName,
// so it never looks like the BuildName is populated.
// if hr.Spec.BuildName == "" {
// if rev.Spec.BuildName == "" {
// t.Error("Missing BuildName; want non-empty, but got empty string")
// }
return hooks.HookComplete
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/revision/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -456,11 +456,11 @@ func (c *RevisionControllerImpl) addBuildEvent(obj interface{}) {
for k := range c.buildtracker.GetTrackers(build) {
// Look up the revision to mark complete.
namespace, name := splitKey(k)
hr, err := c.lister.Revisions(namespace).Get(name)
rev, err := c.lister.Revisions(namespace).Get(name)
if err != nil {
glog.Errorf("Error fetching revision '%s/%s' upon build completion: %v", namespace, name, err)
}
if err := c.markBuildComplete(hr, cond); err != nil {
if err := c.markBuildComplete(rev, cond); err != nil {
glog.Errorf("Error marking build completion for '%s/%s': %v", namespace, name, err)
}
}
Expand Down

0 comments on commit dafce6e

Please sign in to comment.