postgresql: move CI tests to separate targets

test/integration/targets/postgresql/aliases

@@ -5,8 +5,5 @@ postgresql_lang
 postgresql_pg_hba
 postgresql_privs
 postgresql_schema
-postgresql_sequence
-postgresql_set
-postgresql_table
 postgresql_user
 skip/osx

test/integration/targets/postgresql/tasks/main.yml

@@ -10,9 +10,6 @@
   - ansible_os_family == 'Debian'
   - postgres_version_resp.stdout is version('9.4', '>=')
 
-- include_tasks: postgresql_set.yml
-  when: postgres_version_resp.stdout is version('9.4', '>=')
-
 - include_tasks: '{{ loop_item }}'
   loop:
   # Test postgresql_user module
@@ -30,9 +27,6 @@
   # Test postgresql_schema module
   - postgresql_schema.yml
 
-  # Test postgresql_table module
-  - postgresql_table.yml
-
   # Test postgres_pg_hba module
   - postgresql_pg_hba.yml
   loop_control:
@@ -42,10 +36,6 @@
 - import_tasks: test_target_role.yml
   when: postgres_version_resp.stdout is version('9.1', '>=')
 
-# Test postgresql_sequence module
-- import_tasks: postgresql_sequence.yml
-  when: postgres_version_resp.stdout is version('9.0', '>=')
-
 # Test postgresql_lang module.
 # To implement tests, it needs to install some additional packages
 # that may cause problems on different distributions,

test/integration/targets/postgresql_sequence/aliases

@@ -0,0 +1,4 @@
+destructive
+shippable/posix/group4
+postgresql_sequence
+skip/osx

test/integration/targets/postgresql_sequence/defaults/main.yml

@@ -0,0 +1,5 @@
+---
+db_name: 'ansible_db'
+db_user1: 'ansible_db_user1'
+db_user2: 'ansible_db_user2'
+db_default: 'postgres'

test/integration/targets/postgresql_sequence/meta/main.yml

@@ -0,0 +1,3 @@
+---
+dependencies:
+- setup_postgresql_db

test/integration/targets/postgresql_sequence/tasks/main.yml

@@ -0,0 +1,3 @@
+# Initial CI tests of postgresql_sequence module
+- import_tasks: postgresql_sequence_initial.yml
+  when: postgres_version_resp.stdout is version('9.0', '>=')

test/integration/targets/postgresql/tasks/postgresql_sequence.yml → test/integration/targets/postgresql_sequence/tasks/postgresql_sequence_initial.yml

@@ -2,15 +2,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 # Preparation for tests.
-- name: postgresql_sequence - create DB
-  become_user: "{{ pg_user }}"
-  become: yes
-  postgresql_db:
-    state: present
-    name: "{{ db_name }}"
-    owner: "{{ db_user1 }}"
-    login_user: "{{ pg_user }}"
-
 - name: postgresql_sequence - create a user to be owner of a database
   become_user: "{{ pg_user }}"
   become: yes
@@ -20,7 +11,16 @@
     encrypted: yes
     password: password
     role_attr_flags: LOGIN
-    db: "{{ db_name }}"
+    db: "{{ db_default }}"
+    login_user: "{{ pg_user }}"
+
+- name: postgresql_sequence - create DB
+  become_user: "{{ pg_user }}"
+  become: yes
+  postgresql_db:
+    state: present
+    name: "{{ db_name }}"
+    owner: "{{ db_user1 }}"
     login_user: "{{ pg_user }}"
 
 - name: Create a user to be owner of a sequence
@@ -694,3 +694,15 @@
     state: absent
     name: "{{ db_name }}"
     login_user: "{{ pg_user }}"
+
+- name: remove test roles
+  become_user: "{{ pg_user }}"
+  become: yes
+  postgresql_user:
+    state: absent
+    login_db: "{{ db_default }}"
+    login_user: "{{ pg_user }}"
+    name: "{{ item }}"
+  loop:
+  - "{{ db_user1 }}"
+  - "{{ db_user2 }}"

test/integration/targets/postgresql_set/aliases

@@ -0,0 +1,4 @@
+destructive
+shippable/posix/group4
+postgresql_set
+skip/osx

test/integration/targets/postgresql_set/meta/main.yml

@@ -0,0 +1,3 @@
+---
+dependencies:
+- setup_postgresql_db

test/integration/targets/postgresql_set/tasks/main.yml

@@ -0,0 +1,3 @@
+# Initial CI tests of postgresql_initial module
+- include_tasks: postgresql_set_initial.yml
+  when: postgres_version_resp.stdout is version('9.4', '>=')

test/integration/targets/postgresql_table/aliases

@@ -0,0 +1,4 @@
+destructive
+shippable/posix/group4
+postgresql_table
+skip/osx

test/integration/targets/postgresql_table/meta/main.yml

@@ -0,0 +1,3 @@
+---
+dependencies:
+- setup_postgresql_db

test/integration/targets/postgresql_table/tasks/main.yml

@@ -0,0 +1,2 @@
+# Initial CI tests of postgresql_table module
+- import_tasks: postgresql_table_initial.yml

test/integration/targets/postgresql/tasks/postgresql_table.yml → test/integration/targets/postgresql_table/tasks/postgresql_table_initial.yml

@@ -852,3 +852,29 @@
     that:
       - result is changed
       - result.queries == ['ALTER TABLE "public"."test_schema_table" RENAME TO "new_test_schema_table"']
+
+#
+# Clean up
+#
+- name: postgresql_table - drop test schema
+  become_user: "{{ pg_user }}"
+  become: yes
+  postgresql_schema:
+    database: postgres
+    login_user: "{{ pg_user }}"
+    name: acme
+    state: absent
+    cascade_drop: yes
+
+- name: postgresql_table - drop test role
+  become_user: "{{ pg_user }}"
+  become: yes
+  postgresql_user:
+    db: postgres
+    login_user: "{{ pg_user }}"
+    name: "{{ item }}"
+    state: absent
+  loop:
+  - test_user
+  - alice
+  ignore_errors: yes