1 files changed, 48 insertions, 6 deletions
diff --git a/cmd/podman/run_test.go b/cmd/podman/run_test.go
index 622e75d3e..b82df86db 100644
--- a/cmd/podman/run_test.go
+++ b/cmd/podman/run_test.go
@@ -3,6 +3,7 @@ package main
 import (
 	"testing"
 
+	units "github.com/docker/go-units"
 	ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/projectatomic/libpod/libpod"
@@ -65,11 +66,24 @@ func createCLI() cli.App {
 	return a
 }
 
-func getRuntimeSpec(c *cli.Context) *spec.Spec {
-	runtime, _ := getRuntime(c)
-	createConfig, _ := parseCreateOpts(c, runtime, "alpine", generateAlpineImageData())
-	runtimeSpec, _ := createConfigToOCISpec(createConfig)
-	return runtimeSpec
+func getRuntimeSpec(c *cli.Context) (*spec.Spec, error) {
+	/*
+		TODO: This test has never worked. Need to install content
+		runtime, err := getRuntime(c)
+		if err != nil {
+		return nil, err
+		}
+		createConfig, err := parseCreateOpts(c, runtime, "alpine", generateAlpineImageData())
+	*/
+	createConfig, err := parseCreateOpts(c, nil, "alpine", generateAlpineImageData())
+	if err != nil {
+		return nil, err
+	}
+	runtimeSpec, err := createConfigToOCISpec(createConfig)
+	if err != nil {
+		return nil, err
+	}
+	return runtimeSpec, nil
 }
 
 // TestPIDsLimit verifies the inputed pid-limit is correctly defined in the spec
@@ -77,6 +91,34 @@ func TestPIDsLimit(t *testing.T) {
 	a := createCLI()
 	args := []string{"--pids-limit", "22"}
 	a.Run(append(cmd, args...))
-	runtimeSpec := getRuntimeSpec(CLI)
+	runtimeSpec, err := getRuntimeSpec(CLI)
+	if err != nil {
+		t.Fatalf(err.Error())
+	}
 	assert.Equal(t, runtimeSpec.Linux.Resources.Pids.Limit, int64(22))
 }
+
+// TestBLKIOWeightDevice verifies the inputed blkio weigh device is correctly defined in the spec
+func TestBLKIOWeightDevice(t *testing.T) {
+	a := createCLI()
+	args := []string{"--blkio-weight-device", "/dev/sda:100"}
+	a.Run(append(cmd, args...))
+	runtimeSpec, err := getRuntimeSpec(CLI)
+	if err != nil {
+		t.Fatalf(err.Error())
+	}
+	assert.Equal(t, *runtimeSpec.Linux.Resources.BlockIO.WeightDevice[0].Weight, uint16(100))
+}
+
+// TestMemorySwap verifies that the inputed memory swap is correctly defined in the spec
+func TestMemorySwap(t *testing.T) {
+	a := createCLI()
+	args := []string{"--memory-swap", "45m", "--memory", "40m"}
+	a.Run(append(cmd, args...))
+	runtimeSpec, err := getRuntimeSpec(CLI)
+	if err != nil {
+		t.Fatalf(err.Error())
+	}
+	mem, _ := units.RAMInBytes("45m")
+	assert.Equal(t, *runtimeSpec.Linux.Resources.Memory.Swap, mem)
+}