Skip to content

Commit 05b0d89

Browse files
committed
Fix various tests
1 parent c2a3413 commit 05b0d89

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Install dependencies
2828
run: |
2929
python -m pip install --upgrade pip
30-
pip install ansible==13.* jmespath pulp-glue==0.21.*
30+
pip install ansible==13.* jmespath pulp-glue==0.33.* pulp-glue-deb==0.3.*
3131
ansible-galaxy collection install git+file://$(pwd)
3232
3333
- name: Run Pulp in one

tests/test_container_distribution.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@
6565
- dist_result.distribution.name == "test_container_distribution"
6666
- dist_result.distribution.base_path == "test_container_distribution"
6767
- dist_result.distribution.repository == repo_result.repository.pulp_href
68-
- dist_result.distribution.repository_version is none
68+
- dist_result.distribution.repository_version == ""
6969

7070
- name: Verify distribution creation
7171
assert:
7272
that:
7373
- dist_version_1_result.distribution.name == "test_container_distribution_version_1"
7474
- dist_version_1_result.distribution.base_path == "test_container_distribution_version_1"
75-
- dist_version_1_result.distribution.repository is none
75+
- dist_version_1_result.distribution.repository == ""
7676
- dist_version_1_result.distribution.repository_version == repo_result.repository.latest_version_href
7777

7878
- include_role:

tests/test_container_repository.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,22 +94,22 @@
9494

9595
rescue:
9696
- set_fact:
97-
failed_task: "{{ ansible_failed_task }}"
97+
failed_result: "{{ ansible_failed_result }}"
9898

9999
always:
100100
- name: Assert that syncing from a URL that returns 404 fails
101101
assert:
102102
that:
103-
- failed_task.name == "Sync container remotes into repositories"
103+
- failed_result.msg is search("One or more items failed")
104104

105105
- name: Assert that syncing from a URL that returns 404 is retried the correct number of times
106106
assert:
107107
that:
108-
- pulp_repository_container_repos_sync.results[0].attempts == pulp_repository_container_repos_sync_retries
108+
- failed_result.results[0].attempts == pulp_repository_container_repos_sync_retries
109109

110110
- include_role:
111111
name: pulp_repository
112112
vars:
113-
pulp_repository_deb_repos:
113+
pulp_repository_container_repos:
114114
- name: test_container_repo_bad_url
115115
state: absent

0 commit comments

Comments
 (0)