Skip to content

Commit

Permalink
Merge pull request #1108 from MakMukhi/linter_update
Browse files Browse the repository at this point in the history
golint update
  • Loading branch information
menghanl committed Mar 13, 2017
2 parents d50cf2d + 5ebdd30 commit 0713829
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 1 deletion.
2 changes: 1 addition & 1 deletion examples/helloworld/mock/hw_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mock
package mock_test

import (
"fmt"
Expand Down
34 changes: 34 additions & 0 deletions keepalive/keepalive.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,37 @@
/*
*
* Copyright 2017, Google Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/

// Package keepalive defines configurable parameters for point-to-point healthcheck.
package keepalive

import (
Expand Down
1 change: 1 addition & 0 deletions transport/transport_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ func setUpWithNoPingServer(t *testing.T, copts ConnectOptions, done chan net.Con
tr, err := NewClientTransport(context.Background(), TargetInfo{Addr: lis.Addr().String()}, copts)
if err != nil {
// Server clean-up.
lis.Close()
if conn, ok := <-done; ok {
conn.Close()
}
Expand Down

0 comments on commit 0713829

Please sign in to comment.