clientv3: Expose clientv3/examples close to the code.

Many of the tests had missing '// Output:' comment, so were not
runnable. They required fining.

tests/integration/clientv3/examples/example_lease_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package clientv3test
+package clientv3_test
 
 import (
 	"context"
@@ -22,120 +22,148 @@ import (
 	"go.etcd.io/etcd/v3/clientv3"
 )
 
+func mockLease_grant() {
+}
+
 func ExampleLease_grant() {
-	cli, err := clientv3.New(clientv3.Config{
-		Endpoints:   endpoints,
-		DialTimeout: dialTimeout,
+	forUnitTestsRunInMockedContext(mockLease_grant, func() {
+		cli, err := clientv3.New(clientv3.Config{
+			Endpoints:   exampleEndpoints(),
+			DialTimeout: dialTimeout,
+		})
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer cli.Close()
+
+		// minimum lease TTL is 5-second
+		resp, err := cli.Grant(context.TODO(), 5)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		// after 5 seconds, the key 'foo' will be removed
+		_, err = cli.Put(context.TODO(), "foo", "bar", clientv3.WithLease(resp.ID))
+		if err != nil {
+			log.Fatal(err)
+		}
 	})
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer cli.Close()
+	//Output:
+}
 
-	// minimum lease TTL is 5-second
-	resp, err := cli.Grant(context.TODO(), 5)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// after 5 seconds, the key 'foo' will be removed
-	_, err = cli.Put(context.TODO(), "foo", "bar", clientv3.WithLease(resp.ID))
-	if err != nil {
-		log.Fatal(err)
-	}
+func mockLease_revoke() {
+	fmt.Println("number of keys: 0")
 }
 
 func ExampleLease_revoke() {
-	cli, err := clientv3.New(clientv3.Config{
-		Endpoints:   endpoints,
-		DialTimeout: dialTimeout,
+	forUnitTestsRunInMockedContext(mockLease_revoke, func() {
+		cli, err := clientv3.New(clientv3.Config{
+			Endpoints:   exampleEndpoints(),
+			DialTimeout: dialTimeout,
+		})
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer cli.Close()
+
+		resp, err := cli.Grant(context.TODO(), 5)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		_, err = cli.Put(context.TODO(), "foo", "bar", clientv3.WithLease(resp.ID))
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		// revoking lease expires the key attached to its lease ID
+		_, err = cli.Revoke(context.TODO(), resp.ID)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		gresp, err := cli.Get(context.TODO(), "foo")
+		if err != nil {
+			log.Fatal(err)
+		}
+		fmt.Println("number of keys:", len(gresp.Kvs))
 	})
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer cli.Close()
-
-	resp, err := cli.Grant(context.TODO(), 5)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	_, err = cli.Put(context.TODO(), "foo", "bar", clientv3.WithLease(resp.ID))
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// revoking lease expires the key attached to its lease ID
-	_, err = cli.Revoke(context.TODO(), resp.ID)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	gresp, err := cli.Get(context.TODO(), "foo")
-	if err != nil {
-		log.Fatal(err)
-	}
-	fmt.Println("number of keys:", len(gresp.Kvs))
 	// Output: number of keys: 0
 }
 
+func mockLease_keepAlive() {
+	fmt.Println("ttl: 5")
+}
+
 func ExampleLease_keepAlive() {
-	cli, err := clientv3.New(clientv3.Config{
-		Endpoints:   endpoints,
-		DialTimeout: dialTimeout,
+	forUnitTestsRunInMockedContext(mockLease_keepAlive, func() {
+		cli, err := clientv3.New(clientv3.Config{
+			Endpoints:   exampleEndpoints(),
+			DialTimeout: dialTimeout,
+		})
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer cli.Close()
+
+		resp, err := cli.Grant(context.TODO(), 5)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		_, err = cli.Put(context.TODO(), "foo", "bar", clientv3.WithLease(resp.ID))
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		// the key 'foo' will be kept forever
+		ch, kaerr := cli.KeepAlive(context.TODO(), resp.ID)
+		if kaerr != nil {
+			log.Fatal(kaerr)
+		}
+
+		ka := <-ch
+		if ka != nil {
+			fmt.Println("ttl:", ka.TTL)
+		} else {
+			fmt.Println("Unexpected NULL")
+		}
 	})
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer cli.Close()
-
-	resp, err := cli.Grant(context.TODO(), 5)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	_, err = cli.Put(context.TODO(), "foo", "bar", clientv3.WithLease(resp.ID))
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// the key 'foo' will be kept forever
-	ch, kaerr := cli.KeepAlive(context.TODO(), resp.ID)
-	if kaerr != nil {
-		log.Fatal(kaerr)
-	}
-
-	ka := <-ch
-	fmt.Println("ttl:", ka.TTL)
 	// Output: ttl: 5
 }
 
+func mockLease_keepAliveOnce() {
+	fmt.Println("ttl: 5")
+}
+
 func ExampleLease_keepAliveOnce() {
-	cli, err := clientv3.New(clientv3.Config{
-		Endpoints:   endpoints,
-		DialTimeout: dialTimeout,
+	forUnitTestsRunInMockedContext(mockLease_keepAliveOnce, func() {
+		cli, err := clientv3.New(clientv3.Config{
+			Endpoints:   exampleEndpoints(),
+			DialTimeout: dialTimeout,
+		})
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer cli.Close()
+
+		resp, err := cli.Grant(context.TODO(), 5)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		_, err = cli.Put(context.TODO(), "foo", "bar", clientv3.WithLease(resp.ID))
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		// to renew the lease only once
+		ka, kaerr := cli.KeepAliveOnce(context.TODO(), resp.ID)
+		if kaerr != nil {
+			log.Fatal(kaerr)
+		}
+
+		fmt.Println("ttl:", ka.TTL)
 	})
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer cli.Close()
-
-	resp, err := cli.Grant(context.TODO(), 5)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	_, err = cli.Put(context.TODO(), "foo", "bar", clientv3.WithLease(resp.ID))
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// to renew the lease only once
-	ka, kaerr := cli.KeepAliveOnce(context.TODO(), resp.ID)
-	if kaerr != nil {
-		log.Fatal(kaerr)
-	}
-
-	fmt.Println("ttl:", ka.TTL)
 	// Output: ttl: 5
 }