projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14716: Fix accidentally accepting credentials at public download URL.
[arvados.git]
/
services
/
keep-web
/
cadaver_test.go
diff --git
a/services/keep-web/cadaver_test.go
b/services/keep-web/cadaver_test.go
index 0e2f17c35b85df02b98df4d3e29a974d18deb17d..9d9e314fcaf7e25710f1fdd341ca13c7491413f0 100644
(file)
--- a/
services/keep-web/cadaver_test.go
+++ b/
services/keep-web/cadaver_test.go
@@
-9,7
+9,6
@@
import (
"fmt"
"io"
"io/ioutil"
"fmt"
"io"
"io/ioutil"
- "net/url"
"os"
"os/exec"
"path/filepath"
"os"
"os/exec"
"path/filepath"
@@
-74,7
+73,7
@@
func (s *IntegrationSuite) testCadaver(c *check.C, password string, pathFunc fun
var newCollection arvados.Collection
arv := arvados.NewClientFromEnv()
arv.AuthToken = arvadostest.ActiveToken
var newCollection arvados.Collection
arv := arvados.NewClientFromEnv()
arv.AuthToken = arvadostest.ActiveToken
- err = arv.RequestAndDecode(&newCollection, "POST", "arvados/v1/collections",
bytes.NewBufferString(url.Values{"collection": {"{}"}}.Encode()), nil
)
+ err = arv.RequestAndDecode(&newCollection, "POST", "arvados/v1/collections",
nil, map[string]interface{}{"collection": map[string]interface{}{}}
)
c.Assert(err, check.IsNil)
readPath, writePath, pdhPath := pathFunc(newCollection)
c.Assert(err, check.IsNil)
readPath, writePath, pdhPath := pathFunc(newCollection)
@@
-145,6
+144,16
@@
func (s *IntegrationSuite) testCadaver(c *check.C, password string, pathFunc fun
cmd: "move testfile newdir0/\n",
match: `(?ms).*Moving .* failed.*`,
},
cmd: "move testfile newdir0/\n",
match: `(?ms).*Moving .* failed.*`,
},
+ {
+ path: writePath,
+ cmd: "lock newdir0/testfile\n",
+ match: `(?ms).*Locking .* succeeded.*`,
+ },
+ {
+ path: writePath,
+ cmd: "unlock newdir0/testfile\nasdf\n",
+ match: `(?ms).*Unlocking .* succeeded.*`,
+ },
{
path: writePath,
cmd: "ls\n",
{
path: writePath,
cmd: "ls\n",
@@
-160,6
+169,16
@@
func (s *IntegrationSuite) testCadaver(c *check.C, password string, pathFunc fun
cmd: "mkcol newdir1\n",
match: `(?ms).*Creating .* succeeded.*`,
},
cmd: "mkcol newdir1\n",
match: `(?ms).*Creating .* succeeded.*`,
},
+ {
+ path: writePath,
+ cmd: "move newdir1/ newdir1x/\n",
+ match: `(?ms).*Moving .* succeeded.*`,
+ },
+ {
+ path: writePath,
+ cmd: "move newdir1x newdir1\n",
+ match: `(?ms).*Moving .* succeeded.*`,
+ },
{
path: writePath,
cmd: "move newdir0/testfile newdir1/\n",
{
path: writePath,
cmd: "move newdir0/testfile newdir1/\n",
@@
-243,6
+262,11
@@
func (s *IntegrationSuite) testCadaver(c *check.C, password string, pathFunc fun
cmd: "delete foo\n",
match: `(?ms).*Deleting .* failed:.*405 Method Not Allowed.*`,
},
cmd: "delete foo\n",
match: `(?ms).*Deleting .* failed:.*405 Method Not Allowed.*`,
},
+ {
+ path: pdhPath,
+ cmd: "lock foo\n",
+ match: `(?ms).*Locking .* failed:.*405 Method Not Allowed.*`,
+ },
} {
c.Logf("%s %+v", "http://"+s.testServer.Addr, trial)
if skip != nil && skip(trial.path) {
} {
c.Logf("%s %+v", "http://"+s.testServer.Addr, trial)
if skip != nil && skip(trial.path) {
@@
-273,8
+297,8
@@
func (s *IntegrationSuite) TestCadaverByID(c *check.C) {
c.Check(stdout, check.Matches, `(?ms).*collection is empty.*`)
}
for _, path := range []string{
c.Check(stdout, check.Matches, `(?ms).*collection is empty.*`)
}
for _, path := range []string{
- "/by_id/" + arvadostest.Foo
Pdh
,
- "/by_id/" + arvadostest.Foo
Pdh
+ "/",
+ "/by_id/" + arvadostest.Foo
CollectionPDH
,
+ "/by_id/" + arvadostest.Foo
CollectionPDH
+ "/",
"/by_id/" + arvadostest.FooCollection,
"/by_id/" + arvadostest.FooCollection + "/",
} {
"/by_id/" + arvadostest.FooCollection,
"/by_id/" + arvadostest.FooCollection + "/",
} {