github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

Rename Generate[Read|Write]FileCmd()s

Browse Source 
These functions are only used in fixtures.go module.
So it is not necessary to define them for exposing.
This renames these functions for making them local functions clearly.
This commit is contained in:
Kenichi Omichi 2019-10-11 21:54:08 +00:00
parent a847874655
commit e13fb0cbe5
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/e2e/framework/volume/fixtures.go
View File

@ -523,7 +523,7 @@ func testVolumeContent(client clientset.Interface, pod *v1.Pod, fsGroup *int64,
if test.Mode == v1.PersistentVolumeBlock { if test.Mode == v1.PersistentVolumeBlock {
// Block: check content // Block: check content
deviceName := fmt.Sprintf("/opt/%d", i) deviceName := fmt.Sprintf("/opt/%d", i)
commands := GenerateReadBlockCmd(deviceName, len(test.ExpectedContent)) commands := generateReadBlockCmd(deviceName, len(test.ExpectedContent))
_, err := framework.LookForStringInPodExec(pod.Namespace, pod.Name, commands, test.ExpectedContent, time.Minute) _, err := framework.LookForStringInPodExec(pod.Namespace, pod.Name, commands, test.ExpectedContent, time.Minute)
framework.ExpectNoError(err, "failed: finding the contents of the block device %s.", deviceName) framework.ExpectNoError(err, "failed: finding the contents of the block device %s.", deviceName)
@ -532,7 +532,7 @@ func testVolumeContent(client clientset.Interface, pod *v1.Pod, fsGroup *int64,
} else { } else {
// Filesystem: check content // Filesystem: check content
fileName := fmt.Sprintf("/opt/%d/%s", i, test.File) fileName := fmt.Sprintf("/opt/%d/%s", i, test.File)
commands := GenerateReadFileCmd(fileName) commands := generateReadFileCmd(fileName)
_, err := framework.LookForStringInPodExec(pod.Namespace, pod.Name, commands, test.ExpectedContent, time.Minute) _, err := framework.LookForStringInPodExec(pod.Namespace, pod.Name, commands, test.ExpectedContent, time.Minute)
framework.ExpectNoError(err, "failed: finding the contents of the mounted file %s.", fileName) framework.ExpectNoError(err, "failed: finding the contents of the mounted file %s.", fileName)
@ -593,12 +593,12 @@ func InjectContent(client clientset.Interface, config TestConfig, fsGroup *int64
if test.Mode == v1.PersistentVolumeBlock { if test.Mode == v1.PersistentVolumeBlock {
// Block: write content // Block: write content
deviceName := fmt.Sprintf("/opt/%d", i) deviceName := fmt.Sprintf("/opt/%d", i)
commands = append(commands, GenerateWriteBlockCmd(test.ExpectedContent, deviceName)...) commands = append(commands, generateWriteBlockCmd(test.ExpectedContent, deviceName)...)
} else { } else {
// Filesystem: write content // Filesystem: write content
fileName := fmt.Sprintf("/opt/%d/%s", i, test.File) fileName := fmt.Sprintf("/opt/%d/%s", i, test.File)
commands = append(commands, GenerateWriteFileCmd(test.ExpectedContent, fileName)...) commands = append(commands, generateWriteFileCmd(test.ExpectedContent, fileName)...)
} }
out, err := framework.RunKubectl(commands...) out, err := framework.RunKubectl(commands...)
framework.ExpectNoError(err, "failed: writing the contents: %s", out) framework.ExpectNoError(err, "failed: writing the contents: %s", out)
@ -634,9 +634,9 @@ func GenerateScriptCmd(command string) []string {
return commands return commands
} }
// GenerateWriteBlockCmd generates the corresponding command lines to write to a block device the given content. // generateWriteBlockCmd generates the corresponding command lines to write to a block device the given content.
// Depending on the Node OS is Windows or linux, the command will use powershell or /bin/sh // Depending on the Node OS is Windows or linux, the command will use powershell or /bin/sh
func GenerateWriteBlockCmd(content, fullPath string) []string { func generateWriteBlockCmd(content, fullPath string) []string {
var commands []string var commands []string
if !framework.NodeOSDistroIs("windows") { if !framework.NodeOSDistroIs("windows") {
commands = []string{"/bin/sh", "-c", "echo '" + content + "' > " + fullPath} commands = []string{"/bin/sh", "-c", "echo '" + content + "' > " + fullPath}
@ -646,9 +646,9 @@ func GenerateWriteBlockCmd(content, fullPath string) []string {
return commands return commands
} }
// GenerateWriteFileCmd generates the corresponding command lines to write a file with the given content and file path. // generateWriteFileCmd generates the corresponding command lines to write a file with the given content and file path.
// Depending on the Node OS is Windows or linux, the command will use powershell or /bin/sh // Depending on the Node OS is Windows or linux, the command will use powershell or /bin/sh
func GenerateWriteFileCmd(content, fullPath string) []string { func generateWriteFileCmd(content, fullPath string) []string {
var commands []string var commands []string
if !framework.NodeOSDistroIs("windows") { if !framework.NodeOSDistroIs("windows") {
commands = []string{"/bin/sh", "-c", "echo '" + content + "' > " + fullPath} commands = []string{"/bin/sh", "-c", "echo '" + content + "' > " + fullPath}
@ -658,9 +658,9 @@ func GenerateWriteFileCmd(content, fullPath string) []string {
return commands return commands
} }
// GenerateReadFileCmd generates the corresponding command lines to read from a file with the given file path. // generateReadFileCmd generates the corresponding command lines to read from a file with the given file path.
// Depending on the Node OS is Windows or linux, the command will use powershell or /bin/sh // Depending on the Node OS is Windows or linux, the command will use powershell or /bin/sh
func GenerateReadFileCmd(fullPath string) []string { func generateReadFileCmd(fullPath string) []string {
var commands []string var commands []string
if !framework.NodeOSDistroIs("windows") { if !framework.NodeOSDistroIs("windows") {
commands = []string{"cat", fullPath} commands = []string{"cat", fullPath}
@ -670,9 +670,9 @@ func GenerateReadFileCmd(fullPath string) []string {
return commands return commands
} }
// GenerateReadBlockCmd generates the corresponding command lines to read from a block device with the given file path. // generateReadBlockCmd generates the corresponding command lines to read from a block device with the given file path.
// Depending on the Node OS is Windows or linux, the command will use powershell or /bin/sh // Depending on the Node OS is Windows or linux, the command will use powershell or /bin/sh
func GenerateReadBlockCmd(fullPath string, numberOfCharacters int) []string { func generateReadBlockCmd(fullPath string, numberOfCharacters int) []string {
var commands []string var commands []string
if !framework.NodeOSDistroIs("windows") { if !framework.NodeOSDistroIs("windows") {
commands = []string{"head", "-c", strconv.Itoa(numberOfCharacters), fullPath} commands = []string{"head", "-c", strconv.Itoa(numberOfCharacters), fullPath}