Merge pull request #23484 from edsantiago/safename-600
CI: completion system test: use safename
This commit is contained in:
		
						commit
						43a077db87
					
				|  | @ -264,14 +264,13 @@ function _check_no_suggestions() { | ||||||
| 
 | 
 | ||||||
| @test "podman shell completion test" { | @test "podman shell completion test" { | ||||||
| 
 | 
 | ||||||
|     random_container_name=$(random_string 30) |     random_container_name="c-$(safename)" | ||||||
|     random_pod_name=$(random_string 30) |     random_pod_name="p-$(safename)" | ||||||
|     random_image_name=$(random_string 30) |     random_image_name="i-$(safename)" | ||||||
|     random_image_name=${random_image_name,,} # name must be lowercase |  | ||||||
|     random_image_tag=$(random_string 5) |     random_image_tag=$(random_string 5) | ||||||
|     random_network_name=$(random_string 30) |     random_network_name="n-$(safename)" | ||||||
|     random_volume_name=$(random_string 30) |     random_volume_name="v-$(safename)" | ||||||
|     random_secret_name=$(random_string 30) |     random_secret_name="s-$(safename)" | ||||||
|     random_secret_content=$(random_string 30) |     random_secret_content=$(random_string 30) | ||||||
|     secret_file=$PODMAN_TMPDIR/$(random_string 10) |     secret_file=$PODMAN_TMPDIR/$(random_string 10) | ||||||
| 
 | 
 | ||||||
|  | @ -350,15 +349,6 @@ function _check_no_suggestions() { | ||||||
|     for state in created running pause exited; do |     for state in created running pause exited; do | ||||||
|         run_podman rm --force $state-$random_container_name |         run_podman rm --force $state-$random_container_name | ||||||
|     done |     done | ||||||
| 
 |  | ||||||
|     # Clean up the pod pause image |  | ||||||
|     run_podman image list --format '{{.ID}} {{.Repository}}' |  | ||||||
|     while read id name; do |  | ||||||
|         if [[ "$name" =~ /podman-pause ]]; then |  | ||||||
|             run_podman rmi $id |  | ||||||
|         fi |  | ||||||
|     done <<<"$output" |  | ||||||
| 
 |  | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| @test "podman shell completion for paths in container/image" { | @test "podman shell completion for paths in container/image" { | ||||||
|  | @ -389,27 +379,27 @@ function _check_no_suggestions() { | ||||||
|         assert "$output" =~ ".*^../../home/\$.*" "relative home directory suggested (cmd: podman $cmd ../../)" |         assert "$output" =~ ".*^../../home/\$.*" "relative home directory suggested (cmd: podman $cmd ../../)" | ||||||
|     done |     done | ||||||
| 
 | 
 | ||||||
|     random_name=$(random_string 30) |     ctrname="c-$(safename)" | ||||||
|     random_file=$(random_string 30) |     random_file=$(random_string 30) | ||||||
|     run_podman run --name $random_name $IMAGE sh -c "touch /tmp/$random_file && touch /tmp/${random_file}2 && mkdir /emptydir" |     run_podman run --name $ctrname $IMAGE sh -c "touch /tmp/$random_file && touch /tmp/${random_file}2 && mkdir /emptydir" | ||||||
| 
 | 
 | ||||||
|     # check completion for podman cp |     # check completion for podman cp | ||||||
|     run_completion cp "" |     run_completion cp "" | ||||||
|     assert "$output" =~ ".*^$random_name\:\$.*" "podman cp suggest container names" |     assert "$output" =~ ".*^$ctrname\:\$.*" "podman cp suggest container names" | ||||||
| 
 | 
 | ||||||
|     run_completion cp "$random_name:" |     run_completion cp "$ctrname:" | ||||||
|     assert "$output" =~ ".*^$random_name\:/etc/\$.*" "podman cp suggest paths in container" |     assert "$output" =~ ".*^$ctrname\:/etc/\$.*" "podman cp suggest paths in container" | ||||||
| 
 | 
 | ||||||
|     run_completion cp "$random_name:/tmp" |     run_completion cp "$ctrname:/tmp" | ||||||
|     assert "$output" =~ ".*^$random_name\:/tmp/$random_file\$.*" "podman cp suggest custom file in container" |     assert "$output" =~ ".*^$ctrname\:/tmp/$random_file\$.*" "podman cp suggest custom file in container" | ||||||
| 
 | 
 | ||||||
|     run_completion cp "$random_name:/tmp/$random_file" |     run_completion cp "$ctrname:/tmp/$random_file" | ||||||
|     assert "$output" =~ ".*^$random_name\:/tmp/$random_file\$.*" "podman cp suggest /tmp/$random_file file in container" |     assert "$output" =~ ".*^$ctrname\:/tmp/$random_file\$.*" "podman cp suggest /tmp/$random_file file in container" | ||||||
|     assert "$output" =~ ".*^$random_name\:/tmp/${random_file}2\$.*" "podman cp suggest /tmp/${random_file}2 file in container" |     assert "$output" =~ ".*^$ctrname\:/tmp/${random_file}2\$.*" "podman cp suggest /tmp/${random_file}2 file in container" | ||||||
| 
 | 
 | ||||||
|     run_completion cp "$random_name:/emptydir" |     run_completion cp "$ctrname:/emptydir" | ||||||
|     assert "$output" =~ ".*^$random_name\:/emptydir/\$.*ShellCompDirectiveNoSpace" "podman cp suggest empty dir with no space directive (:2)" |     assert "$output" =~ ".*^$ctrname\:/emptydir/\$.*ShellCompDirectiveNoSpace" "podman cp suggest empty dir with no space directive (:2)" | ||||||
| 
 | 
 | ||||||
|     # cleanup container |     # cleanup container | ||||||
|     run_podman rm $random_name |     run_podman rm $ctrname | ||||||
| } | } | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue