Commit f7daa0aa authored by Derek Nola's avatar Derek Nola

Fix various E2E test function names and descriptions

parent 0cb44320
...@@ -13,7 +13,6 @@ import ( ...@@ -13,7 +13,6 @@ import (
"k8s.io/utils/set" "k8s.io/utils/set"
) )
var k3sImage = flag.String("k3sImage", "rancher/systemd-node", "The image used to provision containers")
var serverCount = flag.Int("serverCount", 3, "number of server nodes") var serverCount = flag.Int("serverCount", 3, "number of server nodes")
var agentCount = flag.Int("agentCount", 1, "number of agent nodes") var agentCount = flag.Int("agentCount", 1, "number of agent nodes")
var ci = flag.Bool("ci", false, "running on CI") var ci = flag.Bool("ci", false, "running on CI")
...@@ -31,7 +30,7 @@ var _ = Describe("Verify snapshots and cluster restores work", Ordered, func() { ...@@ -31,7 +30,7 @@ var _ = Describe("Verify snapshots and cluster restores work", Ordered, func() {
Context("Setup Cluster", func() { Context("Setup Cluster", func() {
It("should provision servers and agents", func() { It("should provision servers and agents", func() {
var err error var err error
config, err = tester.NewTestConfig(*k3sImage) config, err = tester.NewTestConfig("rancher/systemd-node")
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Expect(config.ProvisionServers(*serverCount)).To(Succeed()) Expect(config.ProvisionServers(*serverCount)).To(Succeed())
Expect(config.ProvisionAgents(*agentCount)).To(Succeed()) Expect(config.ProvisionAgents(*agentCount)).To(Succeed())
......
...@@ -28,7 +28,7 @@ func Test_E2EAutoImport(t *testing.T) { ...@@ -28,7 +28,7 @@ func Test_E2EAutoImport(t *testing.T) {
RegisterFailHandler(Fail) RegisterFailHandler(Fail)
flag.Parse() flag.Parse()
suiteConfig, reporterConfig := GinkgoConfiguration() suiteConfig, reporterConfig := GinkgoConfiguration()
RunSpecs(t, "Create Cluster Test Suite", suiteConfig, reporterConfig) RunSpecs(t, "Auto Import Test Suite", suiteConfig, reporterConfig)
} }
var tc *e2e.TestConfig var tc *e2e.TestConfig
......
package rotateca package btrfs
import ( import (
"flag" "flag"
......
...@@ -25,11 +25,11 @@ var local = flag.Bool("local", false, "deploy a locally built K3s binary") ...@@ -25,11 +25,11 @@ var local = flag.Bool("local", false, "deploy a locally built K3s binary")
// E2E_RELEASE_VERSION=v1.23.1+k3s2 (default: latest commit from master) // E2E_RELEASE_VERSION=v1.23.1+k3s2 (default: latest commit from master)
// E2E_REGISTRY: true/false (default: false) // E2E_REGISTRY: true/false (default: false)
func Test_E2EPrivateRegistry(t *testing.T) { func Test_E2EEmbeddedMirror(t *testing.T) {
RegisterFailHandler(Fail) RegisterFailHandler(Fail)
flag.Parse() flag.Parse()
suiteConfig, reporterConfig := GinkgoConfiguration() suiteConfig, reporterConfig := GinkgoConfiguration()
RunSpecs(t, "Create Cluster Test Suite", suiteConfig, reporterConfig) RunSpecs(t, "Embedded Mirror Test Suite", suiteConfig, reporterConfig)
} }
var tc *e2e.TestConfig var tc *e2e.TestConfig
......
...@@ -31,7 +31,7 @@ func Test_E2EPrivateRegistry(t *testing.T) { ...@@ -31,7 +31,7 @@ func Test_E2EPrivateRegistry(t *testing.T) {
RegisterFailHandler(Fail) RegisterFailHandler(Fail)
flag.Parse() flag.Parse()
suiteConfig, reporterConfig := GinkgoConfiguration() suiteConfig, reporterConfig := GinkgoConfiguration()
RunSpecs(t, "Create Cluster Test Suite", suiteConfig, reporterConfig) RunSpecs(t, "Private Registry Test Suite", suiteConfig, reporterConfig)
} }
var tc *e2e.TestConfig var tc *e2e.TestConfig
......
...@@ -22,11 +22,11 @@ var local = flag.Bool("local", false, "deploy a locally built K3s binary") ...@@ -22,11 +22,11 @@ var local = flag.Bool("local", false, "deploy a locally built K3s binary")
// Environment Variables Info: // Environment Variables Info:
// E2E_RELEASE_VERSION=v1.27.1+k3s2 or nil for latest commit from master // E2E_RELEASE_VERSION=v1.27.1+k3s2 or nil for latest commit from master
func Test_E2ERootlessStartupValidation(t *testing.T) { func Test_E2ERootless(t *testing.T) {
RegisterFailHandler(Fail) RegisterFailHandler(Fail)
flag.Parse() flag.Parse()
suiteConfig, reporterConfig := GinkgoConfiguration() suiteConfig, reporterConfig := GinkgoConfiguration()
RunSpecs(t, "Startup Test Suite", suiteConfig, reporterConfig) RunSpecs(t, "Rootless Test Suite", suiteConfig, reporterConfig)
} }
var tc *e2e.TestConfig var tc *e2e.TestConfig
......
...@@ -29,7 +29,7 @@ func Test_E2ES3(t *testing.T) { ...@@ -29,7 +29,7 @@ func Test_E2ES3(t *testing.T) {
RegisterFailHandler(Fail) RegisterFailHandler(Fail)
flag.Parse() flag.Parse()
suiteConfig, reporterConfig := GinkgoConfiguration() suiteConfig, reporterConfig := GinkgoConfiguration()
RunSpecs(t, "Create Cluster Test Suite", suiteConfig, reporterConfig) RunSpecs(t, "S3 Snapshot Test Suite", suiteConfig, reporterConfig)
} }
var tc *e2e.TestConfig var tc *e2e.TestConfig
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment