opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-11-28 17:18:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27484 from xiaolinny/main

Browse Source 
chore: fix the inconsistent method names in the comments
This commit is contained in:
openshift-merge-bot[bot]
2025-11-10 20:18:48 +00:00
committed by GitHub
parent 60a8df5a88 4e169dac8f
commit 481c5d9fab
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/util/utils.go
View File

@@ -1177,7 +1177,7 @@ func IDtoolsToRuntimeSpec(idMaps []idtools.IDMap) (convertedIDMap []specs.LinuxI
return convertedIDMap return convertedIDMap
} }
// RuntimeSpecToIDtoolsTo converts runtime spec to the one of the idtools ID mapping // RuntimeSpecToIDtools converts runtime spec to the one of the idtools ID mapping
func RuntimeSpecToIDtools(idMaps []specs.LinuxIDMapping) (convertedIDMap []idtools.IDMap) { func RuntimeSpecToIDtools(idMaps []specs.LinuxIDMapping) (convertedIDMap []idtools.IDMap) {
for _, idmap := range idMaps { for _, idmap := range idMaps {
tempIDMap := idtools.IDMap{ tempIDMap := idtools.IDMap{

4
test/e2e/common_test.go
View File

@@ -294,7 +294,7 @@ const (
PodmanTestCreateUtilTargetMTLS = "mtls" PodmanTestCreateUtilTargetMTLS = "mtls"
) )
// PodmanTestCreate creates a PodmanTestIntegration instance for the tests // PodmanTestCreateUtil creates a PodmanTestIntegration instance for the tests
func PodmanTestCreateUtil(tempDir string, target PodmanTestCreateUtilTarget) *PodmanTestIntegration { func PodmanTestCreateUtil(tempDir string, target PodmanTestCreateUtilTarget) *PodmanTestIntegration {
host := GetHostDistributionInfo() host := GetHostDistributionInfo()
cwd, _ := os.Getwd() cwd, _ := os.Getwd()
@@ -964,7 +964,7 @@ func (p *PodmanTestIntegration) CleanupVolume() {
checkStderrCleanupError(session, "volume rm -fa error logged") checkStderrCleanupError(session, "volume rm -fa error logged")
} }
// CleanupSecret cleans up the secrets and containers. // CleanupSecrets cleans up the secrets and containers.
// This already calls Cleanup() internally. // This already calls Cleanup() internally.
func (p *PodmanTestIntegration) CleanupSecrets() { func (p *PodmanTestIntegration) CleanupSecrets() {
// Remove all containers // Remove all containers