You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@htrace.apache.org by cm...@apache.org on 2014/12/24 15:37:12 UTC

incubator-htrace git commit: HTRACE-22. Fix golang unit tests (cmccabe)

Repository: incubator-htrace
Updated Branches:
  refs/heads/master fa7a97fde -> 4b108a82e


HTRACE-22. Fix golang unit tests (cmccabe)


Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/4b108a82
Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/4b108a82
Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/4b108a82

Branch: refs/heads/master
Commit: 4b108a82ec28e0e76e2ff0cc23c90c795d8c9e86
Parents: fa7a97f
Author: Colin P. Mccabe <cm...@apache.org>
Authored: Sun Dec 21 16:05:56 2014 -0800
Committer: Colin P. Mccabe <cm...@apache.org>
Committed: Wed Dec 24 06:36:32 2014 -0800

----------------------------------------------------------------------
 htrace-core/src/go/gobuild.sh                                | 2 +-
 htrace-core/src/go/src/org/apache/htrace/common/span_test.go | 1 -
 htrace-core/src/go/src/org/apache/htrace/conf/config_test.go | 6 +++---
 3 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/4b108a82/htrace-core/src/go/gobuild.sh
----------------------------------------------------------------------
diff --git a/htrace-core/src/go/gobuild.sh b/htrace-core/src/go/gobuild.sh
index c0b2268..c689dac 100755
--- a/htrace-core/src/go/gobuild.sh
+++ b/htrace-core/src/go/gobuild.sh
@@ -80,4 +80,4 @@ if [ -n "${ldconfig}" ]; then
     fi
 fi
 
-go "${ACTION}" -v org/apache/htrace/htraced org/apache/htrace/htrace "$@"
+go "${ACTION}" -v org/apache/htrace/... "$@"

http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/4b108a82/htrace-core/src/go/src/org/apache/htrace/common/span_test.go
----------------------------------------------------------------------
diff --git a/htrace-core/src/go/src/org/apache/htrace/common/span_test.go b/htrace-core/src/go/src/org/apache/htrace/common/span_test.go
index 545c669..f3b65fc 100644
--- a/htrace-core/src/go/src/org/apache/htrace/common/span_test.go
+++ b/htrace-core/src/go/src/org/apache/htrace/common/span_test.go
@@ -20,7 +20,6 @@
 package common
 
 import (
-	"math/rand"
 	"testing"
 )
 

http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/4b108a82/htrace-core/src/go/src/org/apache/htrace/conf/config_test.go
----------------------------------------------------------------------
diff --git a/htrace-core/src/go/src/org/apache/htrace/conf/config_test.go b/htrace-core/src/go/src/org/apache/htrace/conf/config_test.go
index 85b1517..b16abb4 100644
--- a/htrace-core/src/go/src/org/apache/htrace/conf/config_test.go
+++ b/htrace-core/src/go/src/org/apache/htrace/conf/config_test.go
@@ -28,7 +28,7 @@ import (
 func TestParseArgV(t *testing.T) {
 	t.Parallel()
 	argv := []string{"-Dfoo=bar", "-Dbaz=123", "-DsillyMode"}
-	bld := &ConfigBuilder{Argv: argv}
+	bld := &Builder{Argv: argv}
 	cnf, err := bld.Build()
 	if err != nil {
 		t.Fatal()
@@ -57,7 +57,7 @@ func TestDefaults(t *testing.T) {
 		"baz":  "456",
 		"foo2": "4611686018427387904",
 	}
-	bld := &ConfigBuilder{Argv: argv, Defaults: defaults}
+	bld := &Builder{Argv: argv, Defaults: defaults}
 	cnf, err := bld.Build()
 	if err != nil {
 		t.Fatal()
@@ -100,7 +100,7 @@ func TestXmlConfigurationFile(t *testing.T) {
 		"foo.bar":     "789",
 		"cmdline.opt": "4611686018427387904",
 	}
-	bld := &ConfigBuilder{Argv: argv, Defaults: defaults, Reader: xmlReader}
+	bld := &Builder{Argv: argv, Defaults: defaults, Reader: xmlReader}
 	cnf, err := bld.Build()
 	if err != nil {
 		t.Fatal()