[ARVADOS] updated: 1b4ec699c9679d8b0d4913b698b9eaef6f7b35e3
git at public.curoverse.com
git at public.curoverse.com
Wed Sep 2 11:54:52 EDT 2015
Summary of changes:
backports/python-ciso8601/fpm-info.sh | 8 ++
backports/python-llfuse/fpm-info.sh | 4 +-
backports/python-pycrypto/fpm-info.sh | 11 ++
backports/python-pycurl/fpm-info.sh | 136 ++++++++++++++++++++-
.../install-compute-node.html.textile.liquid | 44 ++++++-
sdk/go/keepclient/keepclient_test.go | 2 +-
sdk/python/fpm-info.sh | 8 --
sdk/python/tests/run_test_server.py | 12 +-
sdk/python/tests/test_collections.py | 2 +-
services/datamanager/datamanager_test.go | 51 +++++---
10 files changed, 233 insertions(+), 45 deletions(-)
create mode 100644 backports/python-ciso8601/fpm-info.sh
create mode 100644 backports/python-pycrypto/fpm-info.sh
delete mode 100644 sdk/python/fpm-info.sh
via 1b4ec699c9679d8b0d4913b698b9eaef6f7b35e3 (commit)
via 7c9991300ecb9ca57bbe1cb4182ef76d1a645487 (commit)
via 87c7c8b6d23c26ade1a71ae334369ac46c132ada (commit)
via 7ca887a10c55b7fe9400bd3c536e721115a28a6e (commit)
via 041e4e800f83d0bb7f86f59e0a2858a744899825 (commit)
via e88a8ceda8cbc3dfb35b6207cd26d08449dd7d18 (commit)
via 316528db7406bd6986da89fdbfc01688dcb1ad4e (commit)
via ecb657ad9ef120efac6efd5edd1df4b086987542 (commit)
from 5c6c6946b034b821446a3657ca065b5646e0f104 (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 1b4ec699c9679d8b0d4913b698b9eaef6f7b35e3
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Jul 29 04:41:26 2015 -0400
5824: Enable blob signing in integration tests, and send keepstore logs to files.
For some reason, sending keepstore logs to stdout seems to make
keepstore crash silently when invoked from a Go integration test. Work
around this by logging to disk, like we do with API server.
diff --git a/sdk/go/keepclient/keepclient_test.go b/sdk/go/keepclient/keepclient_test.go
index c1f6a3e..e4e459e 100644
--- a/sdk/go/keepclient/keepclient_test.go
+++ b/sdk/go/keepclient/keepclient_test.go
@@ -743,7 +743,7 @@ func (s *ServerRequiredSuite) TestPutGetHead(c *C) {
}
{
hash2, replicas, err := kc.PutB(content)
- c.Check(hash2, Equals, fmt.Sprintf("%s+%d", hash, len(content)))
+ c.Check(hash2, Matches, fmt.Sprintf(`%s\+%d\b.*`, hash, len(content)))
c.Check(replicas, Equals, 2)
c.Check(err, Equals, nil)
}
diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index 8ef87c2..d7739ac 100644
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -310,8 +310,9 @@ def _start_keep(n, keep_args):
for arg, val in keep_args.iteritems():
keep_cmd.append("{}={}".format(arg, val))
+ logf = open(os.path.join(TEST_TMPDIR, 'keep{}.log'.format(n)), 'a+')
kp0 = subprocess.Popen(
- keep_cmd, stdin=open('/dev/null'), stdout=sys.stderr)
+ keep_cmd, stdin=open('/dev/null'), stdout=logf, stderr=logf, close_fds=True)
with open(_pidfile('keep{}'.format(n)), 'w') as f:
f.write(str(kp0.pid))
@@ -326,10 +327,11 @@ def run_keep(blob_signing_key=None, enforce_permissions=False):
stop_keep()
keep_args = {}
- if blob_signing_key:
- with open(os.path.join(TEST_TMPDIR, "keep.blob_signing_key"), "w") as f:
- keep_args['--permission-key-file'] = f.name
- f.write(blob_signing_key)
+ if not blob_signing_key:
+ blob_signing_key = 'zfhgfenhffzltr9dixws36j1yhksjoll2grmku38mi7yxd66h5j4q9w4jzanezacp8s6q0ro3hxakfye02152hncy6zml2ed0uc'
+ with open(os.path.join(TEST_TMPDIR, "keep.blob_signing_key"), "w") as f:
+ keep_args['--blob-signing-key-file'] = f.name
+ f.write(blob_signing_key)
if enforce_permissions:
keep_args['--enforce-permissions'] = 'true'
with open(os.path.join(TEST_TMPDIR, "keep.data-manager-token-file"), "w") as f:
diff --git a/sdk/python/tests/test_collections.py b/sdk/python/tests/test_collections.py
index 13fc88d..ac7dd1b 100644
--- a/sdk/python/tests/test_collections.py
+++ b/sdk/python/tests/test_collections.py
@@ -1144,7 +1144,7 @@ class CollectionCreateUpdateTest(run_test_server.TestCaseWithServers):
c2.save()
c1.update()
- self.assertRegexpMatches(c1.manifest_text(), r"\. e65075d550f9b5bf9992fa1d71a131be\+3 7ac66c0f148de9519b8bd264312c4d64\+7\+A[a-f0-9]{40}@[a-f0-9]{8} 0:3:count\.txt 3:7:count\.txt~\d\d\d\d\d\d\d\d-\d\d\d\d\d\d~conflict~$")
+ self.assertRegexpMatches(c1.manifest_text(), r"\. e65075d550f9b5bf9992fa1d71a131be\+3\S* 7ac66c0f148de9519b8bd264312c4d64\+7\S* 0:3:count\.txt 3:7:count\.txt~\d\d\d\d\d\d\d\d-\d\d\d\d\d\d~conflict~$")
if __name__ == '__main__':
commit 7c9991300ecb9ca57bbe1cb4182ef76d1a645487
Merge: 87c7c8b 7ca887a
Author: radhika <radhika at curoverse.com>
Date: Wed Sep 2 11:51:14 2015 -0400
Merge branch 'master' into 6260-test-datamanager
commit 87c7c8b6d23c26ade1a71ae334369ac46c132ada
Author: radhika <radhika at curoverse.com>
Date: Wed Sep 2 11:31:03 2015 -0400
6260: Add TestGetStatusRepeatedly
diff --git a/services/datamanager/datamanager_test.go b/services/datamanager/datamanager_test.go
index 492d402..ef16423 100644
--- a/services/datamanager/datamanager_test.go
+++ b/services/datamanager/datamanager_test.go
@@ -7,7 +7,6 @@ import (
"git.curoverse.com/arvados.git/sdk/go/arvadostest"
"git.curoverse.com/arvados.git/sdk/go/keepclient"
"git.curoverse.com/arvados.git/services/datamanager/keep"
- "io"
"io/ioutil"
"log"
"net/http"
@@ -148,28 +147,13 @@ func DataManagerSingleRun(t *testing.T) {
}
}
-func MakeRequest(t *testing.T, path string) io.Reader {
- client := http.Client{}
- req, err := http.NewRequest("GET", path, strings.NewReader("resp"))
- req.Header.Add("Authorization", "OAuth2 "+keep.GetDataManagerToken(nil))
- req.Header.Add("Content-Type", "application/octet-stream")
- resp, err := client.Do(req)
- defer resp.Body.Close()
-
- if err != nil {
- t.Fatalf("Error during %s %s", path, err)
- }
-
- return resp.Body
-}
-
func GetBlockIndexes(t *testing.T) []string {
var indexes []string
for i := 0; i < len(keepServers); i++ {
path := keepServers[i] + "/index"
client := http.Client{}
- req, err := http.NewRequest("GET", path, strings.NewReader("resp"))
+ req, err := http.NewRequest("GET", path, nil)
req.Header.Add("Authorization", "OAuth2 "+keep.GetDataManagerToken(nil))
req.Header.Add("Content-Type", "application/octet-stream")
resp, err := client.Do(req)
@@ -275,7 +259,7 @@ func BackdateBlocks(t *testing.T, oldBlockLocators []string) {
func GetStatus(t *testing.T, path string) interface{} {
client := http.Client{}
- req, err := http.NewRequest("GET", path, strings.NewReader("resp"))
+ req, err := http.NewRequest("GET", path, nil)
req.Header.Add("Authorization", "OAuth2 "+keep.GetDataManagerToken(nil))
req.Header.Add("Content-Type", "application/octet-stream")
resp, err := client.Do(req)
@@ -381,7 +365,9 @@ func TestPutAndGetBlocks(t *testing.T) {
// Invoking datamanager singlerun several times resulting in errors.
// Until that issue is resolved, don't run this test in the meantime.
-func x_TestInvokeDatamanagerSingleRunRepeatedly(t *testing.T) {
+func TestDatamanagerSingleRunRepeatedly(t *testing.T) {
+ log.Print("TestDatamanagerSingleRunRepeatedly start")
+
defer TearDownDataManagerTest(t)
SetupDataManagerTest(t)
@@ -393,3 +379,30 @@ func x_TestInvokeDatamanagerSingleRunRepeatedly(t *testing.T) {
time.Sleep(1 * time.Second)
}
}
+
+func TestGetStatusRepeatedly(t *testing.T) {
+ log.Print("TestGetStatusRepeatedly start")
+
+ defer TearDownDataManagerTest(t)
+ SetupDataManagerTest(t)
+
+ for i := 0; i < 10; i++ {
+ for j := 0; j < 2; j++ {
+ s := GetStatus(t, keepServers[j]+"/status.json")
+
+ var pullQueueStatus interface{}
+ pullQueueStatus = s.(map[string]interface{})["PullQueue"]
+ var trashQueueStatus interface{}
+ trashQueueStatus = s.(map[string]interface{})["TrashQueue"]
+
+ if pullQueueStatus.(map[string]interface{})["Queued"] == nil ||
+ pullQueueStatus.(map[string]interface{})["InProgress"] == nil ||
+ trashQueueStatus.(map[string]interface{})["Queued"] == nil ||
+ trashQueueStatus.(map[string]interface{})["InProgress"] == nil {
+ t.Fatalf("PullQueue and TrashQueue status not found")
+ }
+
+ time.Sleep(1 * time.Second)
+ }
+ }
+}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list