summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2022-04-27 15:12:57 -0600
committerEd Santiago <santiago@redhat.com>2022-04-28 05:43:41 -0600
commita5aea8e503e6b2e6226392008c975444c76bc55b (patch)
tree8de80bf8f4c9605aa463d73552c6e375b7a8e805
parentb3f38c31b29b51440edd5913a90019efbced0862 (diff)
downloadpodman-a5aea8e503e6b2e6226392008c975444c76bc55b.tar.gz
podman-a5aea8e503e6b2e6226392008c975444c76bc55b.tar.bz2
podman-a5aea8e503e6b2e6226392008c975444c76bc55b.zip
Three manual fixes
Two for this error: invalid indirect of pod.Spec.DNSConfig.Options[0] ...and one for a gofmt error (spaces). Signed-off-by: Ed Santiago <santiago@redhat.com>
-rw-r--r--test/e2e/create_test.go2
-rw-r--r--test/e2e/generate_kube_test.go6
2 files changed, 5 insertions, 3 deletions
diff --git a/test/e2e/create_test.go b/test/e2e/create_test.go
index 9b1340a2c..d0813459d 100644
--- a/test/e2e/create_test.go
+++ b/test/e2e/create_test.go
@@ -448,7 +448,7 @@ var _ = Describe("Podman create", func() {
inspect.WaitWithDefaultTimeout()
data := inspect.InspectContainerToJSON()
Expect(data).To(HaveLen(1))
- Expect(data[0].HostConfig).To(HaveField("MemorySwap", int64(2 * numMem)))
+ Expect(data[0].HostConfig).To(HaveField("MemorySwap", int64(2*numMem)))
})
It("podman create --cpus 5 sets nanocpus", func() {
diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go
index cddf87b74..c92c1519f 100644
--- a/test/e2e/generate_kube_test.go
+++ b/test/e2e/generate_kube_test.go
@@ -777,7 +777,8 @@ var _ = Describe("Podman generate kube", func() {
Expect(pod.Spec.DNSConfig.Searches).To(ContainElement("foobar.com"))
Expect(len(pod.Spec.DNSConfig.Options)).To(BeNumerically(">", 0))
Expect(pod.Spec.DNSConfig.Options[0]).To(HaveField("Name", "color"))
- Expect(*pod.Spec.DNSConfig.Options[0]).To(HaveField("Value", "blue"))
+ s := "blue"
+ Expect(pod.Spec.DNSConfig.Options[0]).To(HaveField("Value", &s))
})
It("podman generate kube multiple container dns servers and options are cumulative", func() {
@@ -820,7 +821,8 @@ var _ = Describe("Podman generate kube", func() {
Expect(pod.Spec.DNSConfig.Searches).To(ContainElement("foobar.com"))
Expect(len(pod.Spec.DNSConfig.Options)).To(BeNumerically(">", 0))
Expect(pod.Spec.DNSConfig.Options[0]).To(HaveField("Name", "color"))
- Expect(*pod.Spec.DNSConfig.Options[0]).To(HaveField("Value", "blue"))
+ s := "blue"
+ Expect(pod.Spec.DNSConfig.Options[0]).To(HaveField("Value", &s))
})
It("podman generate kube - set entrypoint as command", func() {