Merge pull request #1 from route1337/cleanerTesting

Moving test data to it's own role

.kitchen.yml

@@ -33,6 +33,7 @@ suites:
       playbook: tests/playbooks/repo-role.yml
       hosts: kitchen
       roles_path: .
+      additional_copy_role_path: tests/roles
       ansible_inventory: tests/inventory
       host_vars_path: tests/host_vars/standard
     verifier:
@@ -45,6 +46,7 @@ suites:
       playbook: tests/playbooks/repo-role.yml
       hosts: kitchen
       roles_path: .
+      additional_copy_role_path: tests/roles
       ansible_inventory: tests/inventory
       host_vars_path: tests/host_vars/no-user-management
     verifier:

CHANGELOG.md

@@ -2,8 +2,15 @@ Ansible Role - Linux Users: Changelog
 =====================================
 A list of all the changes made to this repo and the role it contains
 
+Version 1.0.1
+-------------
+
+1. Moved test user creation to a role located at `test/roles/generate-test-data` in order to avoid production use of
+the role always showing it skip test users with suspicious names
+2. Documentation updates around what the `is_kitchen` variable does
+
 Version 1.0.0
-------------
+-------------
 
 1. Initial Release of repository
 

README.md

@@ -63,8 +63,8 @@ The following variables are optional:
 
 The following variables should only be used in testing:
 
-1. `is_kitchen` - If this variable is defined test users are created and logic changes to exclude the vagrant user from
-management
+1. `is_kitchen` - If this variable is defined the role(s) in `tests/roles` create sample users for testing unapproved user
+deletion against. Additionally the `user_cleanup.yml` play will exempt the `vagrant` user from deletion 
 
 Testing
 -------

tasks/main.yml

@@ -18,7 +18,5 @@
   when: ansible_distribution == 'Ubuntu'
 - import_tasks: users.yml
   when: ansible_distribution == 'Ubuntu' and linux_users.users is defined
-- import_tasks: kitchen_testing.yml
-  when: ansible_distribution == 'Ubuntu' and is_kitchen is defined
 - import_tasks: user_cleanup.yml
   when: ansible_distribution == 'Ubuntu' and linux_users.users is defined

tests/playbooks/repo-role.yml

@@ -15,4 +15,5 @@
 # Run the single role in this repo on all linux systems
 - hosts: kitchen
   roles:
+    - '/tmp/kitchen/roles/roles/generate-test-data'
     - '/tmp/kitchen/roles'

tests/roles/generate-test-data/tasks/main.yml

@@ -0,0 +1,16 @@
+---
+#
+# Project:: Ansible Role - Linux Users
+#
+# Copyright 2020, Route 1337, LLC, All Rights Reserved.
+#
+# Maintainers:
+# - Matthew Ahrenstein: [email protected]
+#
+# See LICENSE
+#
+
+# Manage setting variables and users for the Test Kitchen environment
+
+- import_tasks: sample-users.yml
+  when: ansible_distribution == 'Ubuntu'

tasks/kitchen_testing.yml → tests/roles/generate-test-data/tasks/sample-users.yml

@@ -10,8 +10,7 @@
 # See LICENSE
 #
 
-# Create a test user for verifying user cleanup works
-# This only runs if is_kitchen is defined
+# Generate some test users to assist in testing the role
 
 - name: Create a test user called "baduser" outside of inventory to verify the user cleanup works
   user: