Move apache, zabbix, postgresql and rabbitmq state tests into own

directories.

tests/filename_map.yml

@@ -28,10 +28,10 @@ salt/modules/(debian_service|freebsdservice|gentoo_service|launchctl_service|mac
   - integration.states.test_service
 
 salt/modules/*apache.py:
-  - pytests.unit.states.test_apache
-  - pytests.unit.states.test_apache_conf
-  - pytests.unit.states.test_apache_module
-  - pytests.unit.states.test_apache_site
+  - pytests.unit.states.apache.test_apache
+  - pytests.unit.states.apache.test_conf
+  - pytests.unit.states.apache.test_module
+  - pytests.unit.states.apache.test_site
 
 salt/modules/augeas_cfg.py:
   - unit.states.test_augeas
@@ -65,21 +65,21 @@ salt/modules/openvswitch.py:
   - pytests.unit.states.test_openvswitch_port
 
 salt/(states|modules)/.*postgres.py:
-  - pytests.unit.states.test_postgres_cluster
-  - pytests.unit.states.test_postgres_database
-  - pytests.unit.states.test_postgres_extension
-  - pytests.unit.states.test_postgres_group
-  - pytests.unit.states.test_postgres_initdb
-  - pytests.unit.states.test_postgres_language
-  - pytests.unit.states.test_postgres_privileges
-  - pytests.unit.states.test_postgres_schema
-  - pytests.unit.states.test_postgres_user
+  - pytests.unit.states.postgresql.test_cluster
+  - pytests.unit.states.postgresql.test_database
+  - pytests.unit.states.postgresql.test_extension
+  - pytests.unit.states.postgresql.test_group
+  - pytests.unit.states.postgresql.test_initdb
+  - pytests.unit.states.postgresql.test_language
+  - pytests.unit.states.postgresql.test_privileges
+  - pytests.unit.states.postgresql.test_schema
+  - pytests.unit.states.postgresql.test_user
 
 salt/modules/rabbitmq.py:
-  - pytests.unit.states.test_rabbitmq_cluster
-  - pytests.unit.states.test_rabbitmq_plugin
-  - pytests.unit.states.test_rabbitmq_policy
-  - pytests.unit.states.test_rabbitmq_vhost
+  - pytests.unit.states.rabbitmq.test_cluster
+  - pytests.unit.states.rabbitmq.test_plugin
+  - pytests.unit.states.rabbitmq.test_policy
+  - pytests.unit.states.rabbitmq.test_vhost
   - integration.states.test_rabbitmq_user
   - integration.states.test_rabbitmq_vhost