[ARVADOS] updated: 10382e4e34d7ce9dd572fed50f7747124b2d857a

git at public.curoverse.com git at public.curoverse.com
Sun Feb 14 20:29:54 EST 2016


Summary of changes:
 services/crunch-run/crunchrun_test.go | 54 +++++++++++++++++------------------
 services/crunch-run/logging_test.go   | 13 +++++----
 2 files changed, 34 insertions(+), 33 deletions(-)

       via  10382e4e34d7ce9dd572fed50f7747124b2d857a (commit)
      from  0992aab31cf3bc4ddbd889214dcd10922fe7b95d (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 10382e4e34d7ce9dd572fed50f7747124b2d857a
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Sun Feb 14 19:59:04 2016 -0500

    8015: Fix tests

diff --git a/services/crunch-run/crunchrun_test.go b/services/crunch-run/crunchrun_test.go
index f970748..48c22a3 100644
--- a/services/crunch-run/crunchrun_test.go
+++ b/services/crunch-run/crunchrun_test.go
@@ -139,18 +139,18 @@ func (this *ArvTestClient) Create(resourceType string,
 	this.Content = parameters
 
 	if resourceType == "logs" {
-		et := parameters["event_type"].(string)
+		et := parameters["log"].(arvadosclient.Dict)["event_type"].(string)
 		if this.Logs == nil {
 			this.Logs = make(map[string]*bytes.Buffer)
 		}
 		if this.Logs[et] == nil {
 			this.Logs[et] = &bytes.Buffer{}
 		}
-		this.Logs[et].Write([]byte(parameters["properties"].(map[string]string)["text"]))
+		this.Logs[et].Write([]byte(parameters["log"].(arvadosclient.Dict)["properties"].(map[string]string)["text"]))
 	}
 
 	if resourceType == "collections" && output != nil {
-		mt := parameters["manifest_text"].(string)
+		mt := parameters["collection"].(arvadosclient.Dict)["manifest_text"].(string)
 		outmap := output.(*CollectionRecord)
 		outmap.PortableDataHash = fmt.Sprintf("%x+%d", md5.Sum([]byte(mt)), len(mt))
 	}
@@ -176,7 +176,7 @@ func (this *ArvTestClient) Update(resourceType string, uuid string, parameters a
 
 	this.Content = parameters
 	if resourceType == "containers" {
-		if parameters["state"] == "Running" {
+		if parameters["container"].(arvadosclient.Dict)["state"] == "Running" {
 			this.WasSetRunning = true
 		}
 
@@ -399,8 +399,8 @@ func (s *TestSuite) TestCommitLogs(c *C) {
 	err := cr.CommitLogs()
 	c.Check(err, IsNil)
 
-	c.Check(api.Content["name"], Equals, "logs for zzzzz-zzzzz-zzzzzzzzzzzzzzz")
-	c.Check(api.Content["manifest_text"], Equals, ". 744b2e4553123b02fa7b452ec5c18993+123 0:123:crunch-run.txt\n")
+	c.Check(api.Content["collection"].(arvadosclient.Dict)["name"], Equals, "logs for zzzzz-zzzzz-zzzzzzzzzzzzzzz")
+	c.Check(api.Content["collection"].(arvadosclient.Dict)["manifest_text"], Equals, ". 744b2e4553123b02fa7b452ec5c18993+123 0:123:crunch-run.txt\n")
 	c.Check(*cr.LogsPDH, Equals, "63da7bdacf08c40f604daad80c261e9a+60")
 }
 
@@ -412,7 +412,7 @@ func (s *TestSuite) TestUpdateContainerRecordRunning(c *C) {
 	err := cr.UpdateContainerRecordRunning()
 	c.Check(err, IsNil)
 
-	c.Check(api.Content["state"], Equals, "Running")
+	c.Check(api.Content["container"].(arvadosclient.Dict)["state"], Equals, "Running")
 }
 
 func (s *TestSuite) TestUpdateContainerRecordComplete(c *C) {
@@ -430,9 +430,9 @@ func (s *TestSuite) TestUpdateContainerRecordComplete(c *C) {
 	err := cr.UpdateContainerRecordComplete()
 	c.Check(err, IsNil)
 
-	c.Check(api.Content["log"], Equals, *cr.LogsPDH)
-	c.Check(api.Content["exit_code"], Equals, *cr.ExitCode)
-	c.Check(api.Content["state"], Equals, "Complete")
+	c.Check(api.Content["container"].(arvadosclient.Dict)["log"], Equals, *cr.LogsPDH)
+	c.Check(api.Content["container"].(arvadosclient.Dict)["exit_code"], Equals, *cr.ExitCode)
+	c.Check(api.Content["container"].(arvadosclient.Dict)["state"], Equals, "Complete")
 }
 
 func (s *TestSuite) TestUpdateContainerRecordCancelled(c *C) {
@@ -445,9 +445,9 @@ func (s *TestSuite) TestUpdateContainerRecordCancelled(c *C) {
 	err := cr.UpdateContainerRecordComplete()
 	c.Check(err, IsNil)
 
-	c.Check(api.Content["log"], IsNil)
-	c.Check(api.Content["exit_code"], IsNil)
-	c.Check(api.Content["state"], Equals, "Cancelled")
+	c.Check(api.Content["container"].(arvadosclient.Dict)["log"], IsNil)
+	c.Check(api.Content["container"].(arvadosclient.Dict)["exit_code"], IsNil)
+	c.Check(api.Content["container"].(arvadosclient.Dict)["state"], Equals, "Cancelled")
 }
 
 // Used by the TestFullRun*() test below to DRY up boilerplate setup to do full
@@ -468,7 +468,7 @@ func FullRunHelper(c *C, record string, fn func(t *TestDockerClient)) (api *ArvT
 	c.Check(err, IsNil)
 	c.Check(api.WasSetRunning, Equals, true)
 
-	c.Check(api.Content["log"], NotNil)
+	c.Check(api.Content["container"].(arvadosclient.Dict)["log"], NotNil)
 
 	if err != nil {
 		for k, v := range api.Logs {
@@ -497,8 +497,8 @@ func (s *TestSuite) TestFullRunHello(c *C) {
 		t.finish <- dockerclient.WaitResult{}
 	})
 
-	c.Check(api.Content["exit_code"], Equals, 0)
-	c.Check(api.Content["state"], Equals, "Complete")
+	c.Check(api.Content["container"].(arvadosclient.Dict)["exit_code"], Equals, 0)
+	c.Check(api.Content["container"].(arvadosclient.Dict)["state"], Equals, "Complete")
 
 	c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "hello world\n"), Equals, true)
 
@@ -522,9 +522,9 @@ func (s *TestSuite) TestFullRunStderr(c *C) {
 		t.finish <- dockerclient.WaitResult{ExitCode: 1}
 	})
 
-	c.Check(api.Content["log"], NotNil)
-	c.Check(api.Content["exit_code"], Equals, 1)
-	c.Check(api.Content["state"], Equals, "Complete")
+	c.Check(api.Content["container"].(arvadosclient.Dict)["log"], NotNil)
+	c.Check(api.Content["container"].(arvadosclient.Dict)["exit_code"], Equals, 1)
+	c.Check(api.Content["container"].(arvadosclient.Dict)["state"], Equals, "Complete")
 
 	c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "hello\n"), Equals, true)
 	c.Check(strings.HasSuffix(api.Logs["stderr"].String(), "world\n"), Equals, true)
@@ -547,8 +547,8 @@ func (s *TestSuite) TestFullRunDefaultCwd(c *C) {
 		t.finish <- dockerclient.WaitResult{ExitCode: 0}
 	})
 
-	c.Check(api.Content["exit_code"], Equals, 0)
-	c.Check(api.Content["state"], Equals, "Complete")
+	c.Check(api.Content["container"].(arvadosclient.Dict)["exit_code"], Equals, 0)
+	c.Check(api.Content["container"].(arvadosclient.Dict)["state"], Equals, "Complete")
 
 	c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "/\n"), Equals, true)
 }
@@ -570,8 +570,8 @@ func (s *TestSuite) TestFullRunSetCwd(c *C) {
 		t.finish <- dockerclient.WaitResult{ExitCode: 0}
 	})
 
-	c.Check(api.Content["exit_code"], Equals, 0)
-	c.Check(api.Content["state"], Equals, "Complete")
+	c.Check(api.Content["container"].(arvadosclient.Dict)["exit_code"], Equals, 0)
+	c.Check(api.Content["container"].(arvadosclient.Dict)["state"], Equals, "Complete")
 
 	c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "/bin\n"), Equals, true)
 }
@@ -616,7 +616,7 @@ func (s *TestSuite) TestCancel(c *C) {
 
 	c.Check(err, IsNil)
 
-	c.Check(api.Content["log"], NotNil)
+	c.Check(api.Content["container"].(arvadosclient.Dict)["log"], NotNil)
 
 	if err != nil {
 		for k, v := range api.Logs {
@@ -625,7 +625,7 @@ func (s *TestSuite) TestCancel(c *C) {
 		}
 	}
 
-	c.Check(api.Content["state"], Equals, "Cancelled")
+	c.Check(api.Content["container"].(arvadosclient.Dict)["state"], Equals, "Cancelled")
 
 	c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "foo\n"), Equals, true)
 
@@ -648,8 +648,8 @@ func (s *TestSuite) TestFullRunSetEnv(c *C) {
 		t.finish <- dockerclient.WaitResult{ExitCode: 0}
 	})
 
-	c.Check(api.Content["exit_code"], Equals, 0)
-	c.Check(api.Content["state"], Equals, "Complete")
+	c.Check(api.Content["container"].(arvadosclient.Dict)["exit_code"], Equals, 0)
+	c.Check(api.Content["container"].(arvadosclient.Dict)["state"], Equals, "Complete")
 
 	c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "bilbo\n"), Equals, true)
 }
diff --git a/services/crunch-run/logging_test.go b/services/crunch-run/logging_test.go
index 648f700..9b07d32 100644
--- a/services/crunch-run/logging_test.go
+++ b/services/crunch-run/logging_test.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
 	. "gopkg.in/check.v1"
 	"time"
 )
@@ -39,8 +40,8 @@ func (s *LoggingTestSuite) TestWriteLogs(c *C) {
 	logtext := "2015-12-29T15:51:45.000000001Z Hello world!\n" +
 		"2015-12-29T15:51:45.000000002Z Goodbye\n"
 
-	c.Check(api.Content["event_type"], Equals, "crunch-run")
-	c.Check(api.Content["properties"].(map[string]string)["text"], Equals, logtext)
+	c.Check(api.Content["log"].(arvadosclient.Dict)["event_type"], Equals, "crunch-run")
+	c.Check(api.Content["log"].(arvadosclient.Dict)["properties"].(map[string]string)["text"], Equals, logtext)
 	c.Check(string(kc.Content), Equals, logtext)
 }
 
@@ -81,14 +82,14 @@ func (s *LoggingTestSuite) TestWriteMultipleLogs(c *C) {
 	cr.CrunchLog.Close()
 	logtext1 := "2015-12-29T15:51:45.000000001Z Hello world!\n" +
 		"2015-12-29T15:51:45.000000003Z Goodbye\n"
-	c.Check(api.Content["event_type"], Equals, "crunch-run")
-	c.Check(api.Content["properties"].(map[string]string)["text"], Equals, logtext1)
+	c.Check(api.Content["log"].(arvadosclient.Dict)["event_type"], Equals, "crunch-run")
+	c.Check(api.Content["log"].(arvadosclient.Dict)["properties"].(map[string]string)["text"], Equals, logtext1)
 
 	stdout.Close()
 	logtext2 := "2015-12-29T15:51:45.000000002Z Doing stuff\n" +
 		"2015-12-29T15:51:45.000000004Z Blurb\n"
-	c.Check(api.Content["event_type"], Equals, "stdout")
-	c.Check(api.Content["properties"].(map[string]string)["text"], Equals, logtext2)
+	c.Check(api.Content["log"].(arvadosclient.Dict)["event_type"], Equals, "stdout")
+	c.Check(api.Content["log"].(arvadosclient.Dict)["properties"].(map[string]string)["text"], Equals, logtext2)
 
 	mt, err := cr.LogCollection.ManifestText()
 	c.Check(err, IsNil)

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list