X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/bd059862d1dd7e68642dd365f0a536621ff6735f..137f46c8040d22e70e4b17a495e4171c59a8033f:/lib/dispatchcloud/node_size_test.go

diff --git a/lib/dispatchcloud/node_size_test.go b/lib/dispatchcloud/node_size_test.go
index 881c1f523d..eef86f7477 100644
--- a/lib/dispatchcloud/node_size_test.go
+++ b/lib/dispatchcloud/node_size_test.go
@@ -11,7 +11,7 @@ import (
 
 var _ = check.Suite(&NodeSizeSuite{})
 
-const GiB = int64(1 << 30)
+const GiB = arvados.ByteSize(1 << 30)
 
 type NodeSizeSuite struct{}
 
@@ -43,7 +43,7 @@ func (*NodeSizeSuite) TestChooseUnsatisfiable(c *check.C) {
 		checkUnsatisfiable(&arvados.Container{RuntimeConstraints: rc})
 	}
 	checkUnsatisfiable(&arvados.Container{
-		Mounts:             map[string]arvados.Mount{"/tmp": {Kind: "tmp", Capacity: 2 * GiB}},
+		Mounts:             map[string]arvados.Mount{"/tmp": {Kind: "tmp", Capacity: int64(2 * GiB)}},
 		RuntimeConstraints: arvados.RuntimeConstraints{RAM: 12345, VCPUs: 1},
 	})
 }
@@ -76,7 +76,7 @@ func (*NodeSizeSuite) TestChoose(c *check.C) {
 	} {
 		best, err := ChooseInstanceType(&arvados.Cluster{InstanceTypes: menu}, &arvados.Container{
 			Mounts: map[string]arvados.Mount{
-				"/tmp": {Kind: "tmp", Capacity: 2 * GiB},
+				"/tmp": {Kind: "tmp", Capacity: 2 * int64(GiB)},
 			},
 			RuntimeConstraints: arvados.RuntimeConstraints{
 				VCPUs:        2,
@@ -101,7 +101,7 @@ func (*NodeSizeSuite) TestChoosePreemptable(c *check.C) {
 	}
 	best, err := ChooseInstanceType(&arvados.Cluster{InstanceTypes: menu}, &arvados.Container{
 		Mounts: map[string]arvados.Mount{
-			"/tmp": {Kind: "tmp", Capacity: 2 * GiB},
+			"/tmp": {Kind: "tmp", Capacity: 2 * int64(GiB)},
 		},
 		RuntimeConstraints: arvados.RuntimeConstraints{
 			VCPUs:        2,
@@ -119,3 +119,25 @@ func (*NodeSizeSuite) TestChoosePreemptable(c *check.C) {
 	c.Check(best.Scratch >= 2*GiB, check.Equals, true)
 	c.Check(best.Preemptible, check.Equals, true)
 }
+
+func (*NodeSizeSuite) TestScratchForDockerImage(c *check.C) {
+	n := EstimateScratchSpace(&arvados.Container{
+		ContainerImage: "d5025c0f29f6eef304a7358afa82a822+342",
+	})
+	// Actual image is 371.1 MiB (according to workbench)
+	// Estimated size is 384 MiB (402653184 bytes)
+	// Want to reserve 2x the estimated size, so 805306368 bytes
+	c.Check(n, check.Equals, int64(805306368))
+
+	n = EstimateScratchSpace(&arvados.Container{
+		ContainerImage: "d5025c0f29f6eef304a7358afa82a822+-342",
+	})
+	// Parse error will return 0
+	c.Check(n, check.Equals, int64(0))
+
+	n = EstimateScratchSpace(&arvados.Container{
+		ContainerImage: "d5025c0f29f6eef304a7358afa82a822+34",
+	})
+	// Short manifest will return 0
+	c.Check(n, check.Equals, int64(0))
+}