[ARVADOS] updated: d30c3b218773355150aa1ee47fa64150dd1b4111
git at public.curoverse.com
git at public.curoverse.com
Wed Aug 13 11:42:57 EDT 2014
Summary of changes:
doc/sdk/go/index.html.textile.liquid | 8 ++---
sdk/go/arvadosclient/{sdk.go => arvadosclient.go} | 2 +-
.../{sdk_test.go => arvadosclient_test.go} | 7 ++---
sdk/go/keepclient/keepclient.go | 4 +--
sdk/go/keepclient/keepclient_test.go | 35 +++++++++++-----------
services/keepproxy/keepproxy.go | 4 +--
services/keepproxy/keepproxy_test.go | 4 +--
7 files changed, 31 insertions(+), 33 deletions(-)
rename sdk/go/arvadosclient/{sdk.go => arvadosclient.go} (99%)
rename sdk/go/arvadosclient/{sdk_test.go => arvadosclient_test.go} (95%)
via d30c3b218773355150aa1ee47fa64150dd1b4111 (commit)
from 47e64f9150929a7ee27c5f107b06bd4218e90db6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit d30c3b218773355150aa1ee47fa64150dd1b4111
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Aug 13 11:02:25 2014 -0400
3551: Fix more package paths.
diff --git a/doc/sdk/go/index.html.textile.liquid b/doc/sdk/go/index.html.textile.liquid
index 27c4448..0e26369 100644
--- a/doc/sdk/go/index.html.textile.liquid
+++ b/doc/sdk/go/index.html.textile.liquid
@@ -14,8 +14,8 @@ You don't need to install anything. Just import the client like this. The go too
<notextile>
<pre><code class="userinput">import (
- keepclient "git.curoverse.com/arvados.git/sdk/go/keepclient"
- arvadosclient "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
+ "git.curoverse.com/arvados.git/sdk/go/keepclient"
+ "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
)
</code></pre>
</notextile>
@@ -26,8 +26,8 @@ Import the module. (We import the log module here too, so we can use it in the s
<notextile>
<pre><code class="userinput">import (
- keepclient "git.curoverse.com/arvados.git/sdk/go/keepclient"
- arvadosclient "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
+ "git.curoverse.com/arvados.git/sdk/go/keepclient"
+ "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
"log"
)
</code></pre>
diff --git a/sdk/go/arvadosclient/sdk.go b/sdk/go/arvadosclient/arvadosclient.go
similarity index 99%
rename from sdk/go/arvadosclient/sdk.go
rename to sdk/go/arvadosclient/arvadosclient.go
index 9f1880f..3d5aff7 100644
--- a/sdk/go/arvadosclient/sdk.go
+++ b/sdk/go/arvadosclient/arvadosclient.go
@@ -1,6 +1,6 @@
/* Simple Arvados Go SDK for communicating with API server. */
-package sdk
+package arvadosclient
import (
"bytes"
diff --git a/sdk/go/arvadosclient/sdk_test.go b/sdk/go/arvadosclient/arvadosclient_test.go
similarity index 95%
rename from sdk/go/arvadosclient/sdk_test.go
rename to sdk/go/arvadosclient/arvadosclient_test.go
index 8af848f..678c533 100644
--- a/sdk/go/arvadosclient/sdk_test.go
+++ b/sdk/go/arvadosclient/arvadosclient_test.go
@@ -1,4 +1,4 @@
-package sdk
+package arvadosclient
import (
"fmt"
@@ -6,7 +6,6 @@ import (
"net/http"
"os"
"os/exec"
- "strings"
"testing"
)
@@ -21,8 +20,8 @@ var _ = Suite(&ServerRequiredSuite{})
type ServerRequiredSuite struct{}
func pythonDir() string {
- gopath := os.Getenv("GOPATH")
- return fmt.Sprintf("%s/../python/tests", strings.Split(gopath, ":")[0])
+ cwd, _ := os.Getwd()
+ return fmt.Sprintf("%s/../../python/tests", cwd)
}
func (s *ServerRequiredSuite) SetUpSuite(c *C) {
diff --git a/sdk/go/keepclient/keepclient.go b/sdk/go/keepclient/keepclient.go
index aa7e78b..e1c25c9 100644
--- a/sdk/go/keepclient/keepclient.go
+++ b/sdk/go/keepclient/keepclient.go
@@ -2,8 +2,8 @@
package keepclient
import (
- streamer "git.curoverse.com/arvados.git/sdk/go/streamer"
- arvadosclient "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
+ "git.curoverse.com/arvados.git/sdk/go/streamer"
+ "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
"crypto/md5"
"errors"
"fmt"
diff --git a/sdk/go/keepclient/keepclient_test.go b/sdk/go/keepclient/keepclient_test.go
index 5327fb5..66037dc 100644
--- a/sdk/go/keepclient/keepclient_test.go
+++ b/sdk/go/keepclient/keepclient_test.go
@@ -1,8 +1,8 @@
package keepclient
import (
- "arvados.org/sdk"
- "arvados.org/streamer"
+ "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
+ "git.curoverse.com/arvados.git/sdk/go/streamer"
"crypto/md5"
"flag"
"fmt"
@@ -14,7 +14,6 @@ import (
"net/http"
"os"
"os/exec"
- "strings"
"testing"
)
@@ -36,8 +35,8 @@ type ServerRequiredSuite struct{}
type StandaloneSuite struct{}
func pythonDir() string {
- gopath := os.Getenv("GOPATH")
- return fmt.Sprintf("%s/../python/tests", strings.Split(gopath, ":")[0])
+ cwd, _ := os.Getwd()
+ return fmt.Sprintf("%s/../../python/tests", cwd)
}
func (s *ServerRequiredSuite) SetUpSuite(c *C) {
@@ -65,7 +64,7 @@ func (s *ServerRequiredSuite) TestMakeKeepClient(c *C) {
os.Setenv("ARVADOS_API_TOKEN", "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h")
os.Setenv("ARVADOS_API_HOST_INSECURE", "true")
- arv, err := sdk.MakeArvadosClient()
+ arv, err := arvadosclient.MakeArvadosClient()
c.Assert(err, Equals, nil)
kc, err := MakeKeepClient(&arv)
@@ -126,7 +125,7 @@ func UploadToStubHelper(c *C, st http.Handler, f func(KeepClient, string,
listener, url := RunBogusKeepServer(st, 2990)
defer listener.Close()
- arv, _ := sdk.MakeArvadosClient()
+ arv, _ := arvadosclient.MakeArvadosClient()
arv.ApiToken = "abc123"
kc, _ := MakeKeepClient(&arv)
@@ -260,7 +259,7 @@ func (s *StandaloneSuite) TestPutB(c *C) {
"foo",
make(chan string, 2)}
- arv, _ := sdk.MakeArvadosClient()
+ arv, _ := arvadosclient.MakeArvadosClient()
kc, _ := MakeKeepClient(&arv)
kc.Want_replicas = 2
@@ -302,7 +301,7 @@ func (s *StandaloneSuite) TestPutHR(c *C) {
"foo",
make(chan string, 2)}
- arv, _ := sdk.MakeArvadosClient()
+ arv, _ := arvadosclient.MakeArvadosClient()
kc, _ := MakeKeepClient(&arv)
kc.Want_replicas = 2
@@ -356,7 +355,7 @@ func (s *StandaloneSuite) TestPutWithFail(c *C) {
fh := FailHandler{
make(chan string, 1)}
- arv, err := sdk.MakeArvadosClient()
+ arv, err := arvadosclient.MakeArvadosClient()
kc, _ := MakeKeepClient(&arv)
kc.Want_replicas = 2
@@ -405,7 +404,7 @@ func (s *StandaloneSuite) TestPutWithTooManyFail(c *C) {
fh := FailHandler{
make(chan string, 4)}
- arv, err := sdk.MakeArvadosClient()
+ arv, err := arvadosclient.MakeArvadosClient()
kc, _ := MakeKeepClient(&arv)
kc.Want_replicas = 2
@@ -465,7 +464,7 @@ func (s *StandaloneSuite) TestGet(c *C) {
listener, url := RunBogusKeepServer(st, 2990)
defer listener.Close()
- arv, err := sdk.MakeArvadosClient()
+ arv, err := arvadosclient.MakeArvadosClient()
kc, _ := MakeKeepClient(&arv)
arv.ApiToken = "abc123"
kc.SetServiceRoots([]string{url})
@@ -491,7 +490,7 @@ func (s *StandaloneSuite) TestGetFail(c *C) {
listener, url := RunBogusKeepServer(st, 2990)
defer listener.Close()
- arv, err := sdk.MakeArvadosClient()
+ arv, err := arvadosclient.MakeArvadosClient()
kc, _ := MakeKeepClient(&arv)
arv.ApiToken = "abc123"
kc.SetServiceRoots([]string{url})
@@ -521,7 +520,7 @@ func (s *StandaloneSuite) TestChecksum(c *C) {
listener, url := RunBogusKeepServer(st, 2990)
defer listener.Close()
- arv, err := sdk.MakeArvadosClient()
+ arv, err := arvadosclient.MakeArvadosClient()
kc, _ := MakeKeepClient(&arv)
arv.ApiToken = "abc123"
kc.SetServiceRoots([]string{url})
@@ -554,7 +553,7 @@ func (s *StandaloneSuite) TestGetWithFailures(c *C) {
"abc123",
[]byte("foo")}
- arv, err := sdk.MakeArvadosClient()
+ arv, err := arvadosclient.MakeArvadosClient()
kc, _ := MakeKeepClient(&arv)
arv.ApiToken = "abc123"
service_roots := make([]string, 5)
@@ -589,7 +588,7 @@ func (s *ServerRequiredSuite) TestPutGetHead(c *C) {
os.Setenv("ARVADOS_API_TOKEN", "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h")
os.Setenv("ARVADOS_API_HOST_INSECURE", "true")
- arv, err := sdk.MakeArvadosClient()
+ arv, err := arvadosclient.MakeArvadosClient()
kc, err := MakeKeepClient(&arv)
c.Assert(err, Equals, nil)
@@ -638,7 +637,7 @@ func (s *StandaloneSuite) TestPutProxy(c *C) {
st := StubProxyHandler{make(chan string, 1)}
- arv, err := sdk.MakeArvadosClient()
+ arv, err := arvadosclient.MakeArvadosClient()
kc, _ := MakeKeepClient(&arv)
kc.Want_replicas = 2
@@ -669,7 +668,7 @@ func (s *StandaloneSuite) TestPutProxyInsufficientReplicas(c *C) {
st := StubProxyHandler{make(chan string, 1)}
- arv, err := sdk.MakeArvadosClient()
+ arv, err := arvadosclient.MakeArvadosClient()
kc, _ := MakeKeepClient(&arv)
kc.Want_replicas = 3
diff --git a/services/keepproxy/keepproxy.go b/services/keepproxy/keepproxy.go
index 367a9c5..a927b87 100644
--- a/services/keepproxy/keepproxy.go
+++ b/services/keepproxy/keepproxy.go
@@ -1,8 +1,8 @@
package main
import (
- keepclient "git.curoverse.com/arvados.git/sdk/go/keepclient"
- arvadosclient "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
+ "git.curoverse.com/arvados.git/sdk/go/keepclient"
+ "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
"flag"
"fmt"
"github.com/gorilla/mux"
diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go
index 2a74a19..b9d5276 100644
--- a/services/keepproxy/keepproxy_test.go
+++ b/services/keepproxy/keepproxy_test.go
@@ -1,8 +1,8 @@
package main
import (
- keepclient "git.curoverse.com/arvados.git/sdk/go/keepclient"
- arvadosclient "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
+ "git.curoverse.com/arvados.git/sdk/go/keepclient"
+ "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
"crypto/md5"
"crypto/tls"
"fmt"
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list