From 9599630976f46d55b3b18b1507a9c60cd14e3c91 Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Mon, 8 Jan 2018 16:36:53 -0800
Subject: [PATCH] Fixes for dnf and user integration tests. (#34603)

* Fix user test.
* Use `dnf` instead of `yum` in dnf test.
* Install correct version of rpmfluff for tests.
---
 test/integration/targets/dnf/tasks/repo.yml            |  2 +-
 test/integration/targets/setup_rpm_repo/tasks/main.yml | 10 ++++++++++
 test/integration/targets/user/tasks/main.yml           |  1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/test/integration/targets/dnf/tasks/repo.yml b/test/integration/targets/dnf/tasks/repo.yml
index 660c0813c35..6be9147301c 100644
--- a/test/integration/targets/dnf/tasks/repo.yml
+++ b/test/integration/targets/dnf/tasks/repo.yml
@@ -209,6 +209,6 @@
     # ============================================================================
   always:
     - name: Clean up
-      yum:
+      dnf:
         name: foo
         state: absent
diff --git a/test/integration/targets/setup_rpm_repo/tasks/main.yml b/test/integration/targets/setup_rpm_repo/tasks/main.yml
index 4c18a332d1e..05e310faaca 100644
--- a/test/integration/targets/setup_rpm_repo/tasks/main.yml
+++ b/test/integration/targets/setup_rpm_repo/tasks/main.yml
@@ -5,6 +5,14 @@
     when:
       - ansible_distribution in ['RedHat']
 
+  - name: Install rpmfluff and deps
+    package:
+      name: "{{ item }}"
+    with_items:
+      - python{{ ansible_python_version.split(".")[0] }}-rpmfluff
+    when:
+      - ansible_distribution in ['Fedora']
+
   - name: Install rpmfluff and deps
     package:
       name: "{{ item }}"
@@ -12,6 +20,8 @@
       - python-rpmfluff
       - createrepo_c
       - createrepo  # used by el6 version of rpmfluff
+    when:
+      - ansible_distribution not in ['Fedora']
 
   - name: Copy script for creating a repo
     copy:
diff --git a/test/integration/targets/user/tasks/main.yml b/test/integration/targets/user/tasks/main.yml
index 9a1b710d1f7..60e1d06f063 100644
--- a/test/integration/targets/user/tasks/main.yml
+++ b/test/integration/targets/user/tasks/main.yml
@@ -99,6 +99,7 @@
   user:
       name: ansibulluser
       state: absent
+      force: true
   register: user_test2
 - name: make a new list of users
   script: userlist.sh "{{ ansible_distribution }}"