Add additional paths to the filename map

tests/filename_map.yml

@@ -15,10 +15,6 @@ salt/modules/(debian_service|freebsdservice|gentoo_service|launchctl|mac_service
   - unit.states.test_service
   - integration.states.test_service
 
-salt/modules/(freebsd_sysctl|linux_sysctl|mac_sysctl|netbsd_sysctl|openbsd_sysctl)\.py:
-  - unit.states.test_sysctl
-  - integration.modules.test_sysctl
-
 salt/modules/*apache.py:
   - unit.states.test_apache
   - unit.states.test_apache_conf
@@ -53,7 +49,7 @@ salt/modules/mysql.py:
 salt/modules/openvswitch.py:
   - unit.states.test_openvswitch_port
 
-salt/modules/*postgres.py:
+salt/(states|modules)/.*postgres.py:
   - unit.states.test_postgres
   - unit.states.test_postgres_cluster
   - unit.states.test_postgres_database
@@ -77,20 +73,154 @@ salt/modules/ssh.py:
   - unit.states.test_ssh_auth
   - unit.states.test_ssh_known_hosts
 
+salt/auth/*:
+  - integration.shell.test_auth
+
+salt/cache/*:
+  - unit.cache.test_cache
+
+salt/cli/*:
+  - integration.shell.test_arguments
+
+salt/cli/call.py:
+  - integration.shell.test_call
+
+salt/cli/cp.py:
+  - integration.shell.test_cp
+
+salt/cli/key.py:
+  - integration.shell.test_key
+
+salt/cli/salt.py:
+  - integration.cli.test_grains
+  - integration.shell.test_enabled
+  - integration.shell.test_matcher
+  - integration.shell.test_saltcli
+
+salt/client/*:
+  - integration.client.test_kwarg
+  - integration.client.test_runner
+  - integration.client.test_standard
+
 salt/cloud/*:
-  - unit.cloud.test_map_conf
+  - integration.shell.test_cloud
+
+salt/cloud/__init__.py:
+  - integration.cloud.test_cloud
+
+salt/grains/*:
+  - integration.grains.test_custom
+
+salt/minion.py:
+  - integration.shell.test_matcher
+  - integration.client.test_syndic
+
+salt/proxy/*:
+  - integration.proxy.test_shell
+  - integration.proxy.test_simple
+
+salt/state.py:
+  - integration.modules.test_state_jinja_filters
+  - integration.states.test_compiler
+  - integration.states.test_handle_error
+  - integration.states.test_handle_iorder
+  - integration.states.test_match
+  - integration.states.test_renderers
+
+salt/utils/decorators/*:
+  - integration.modules.test_decorators
+
+salt/(utils|renderers)/jinja\.py:
+  - integration.modules.test_state_jinja_filters
+  - integration.states.test_renderers
+
+salt/utils/minions.py:
+  - integration.shell.test_matcher
+
+salt/utils/reactor.py:
+  - integration.reactor.test_reactor
+
+salt/cli/daemons.py:
+  - integration.shell.test_master
+  - integration.shell.test_minion
+  - integration.shell.test_proxy
+  - integration.shell.test_syndic
+
+salt/(client/ssh/.+|cli/ssh\.py):
+  - integration.cli.test_custom_module
+  - integration.ssh.test_deploy
+  - integration.ssh.test_grains
+  - integration.ssh.test_jinja_filters
+  - integration.ssh.test_master
+  - integration.ssh.test_mine
+  - integration.ssh.test_pillar
+  - integration.ssh.test_raw
+  - integration.ssh.test_state
 
 salt/config/*:
   - unit.test_config
 
+salt/loader.py:
+  - integration.loader.test_ext_grains
+  - integration.loader.test_ext_modules
+
+salt/minion.py:
+  - integration.minion.test_blackout
+  - integration.minion.test_pillar
+  - integration.minion.test_timeout
+
+salt/modules/*_sysctl.py:
+  - unit.states.test_sysctl
+  - integration.modules.test_sysctl
+
+salt/netapi/rest_cherrypy/*:
+  - unit.netapi.test_rest_cherrypy
+  - integration.netapi.rest_cherrypy.test_app_pam
+
+salt/netapi/rest_tornado/*:
+  - unit.netapi.test_rest_tornado
+  - integration.netapi.rest_tornado.test_app
+
+salt/output/*:
+  - integration.output.test_output
+
+salt/pillar/__init__.py:
+  - integration.minion.test_pillar
+
+salt/(cli/run\.py|runner\.py):
+  - integration.shell.test_runner
+  - integration.runners.test_runner_returns
+
+salt/runners/venafiapi.py:
+  - integration.externalapi.test_venafiapi
+
 salt/serializers/*:
   - unit.serializers.test_serializers
 
-salt/spm/*:
+salt/(cli/spm\.py|spm/.+):
   - unit.test_spm
+  - integration.shell.test_spm
+  - integration.spm.test_build
+  - integration.spm.test_files
+  - integration.spm.test_info
+  - integration.spm.test_install
+  - integration.spm.test_remove
+  - integration.spm.test_repo
 
 salt/transport/*:
   - unit.test_transport
 
 salt/utils/docker/*:
   - unit.utils.test_docker
+
+salt/utils/schedule.py:
+  - integration.scheduler.test_error
+  - integration.scheduler.test_eval
+  - integration.scheduler.test_postpone
+  - integration.scheduler.test_skip
+
+salt/wheel/*:
+  - integration.wheel.test_client
+
+tests/support/mock.py:
+  - unit.test_mock