Switch tests to use Molecule.

Author: geerlingguy

.gitignore

@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc

.travis.yml

@@ -1,54 +1,30 @@
 ---
+language: python
 services: docker
 
 env:
-  - distro: centos7
-    playbook: centos-7-test.yml
-  - distro: centos6
-    playbook: test.yml
-  - distro: debian8
-    playbook: test.yml
-  - distro: ubuntu1604
-    playbook: test.yml
-  - distro: ubuntu1404
-    playbook: test.yml
+  global:
+    - ROLE_NAME: mysql
+  matrix:
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+    - MOLECULE_DISTRO: centos6
+    - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: debian8
+
+install:
+  # Install test dependencies.
+  - pip install molecule docker
+
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
 script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
-
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
-
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Some MySQL debugging (show all the logs).
-  - docker exec --tty ${container_id} env TERM=xterm ls -lah /var/log
-  - docker exec --tty ${container_id} env TERM=xterm cat /var/log/mysql/error.log || true
-  - docker exec --tty ${container_id} env TERM=xterm cat /var/log/mysql.err || true
-
-  # Check to make sure we can connect to MySQL via Unix socket.
-  - >
-    sudo docker exec ${container_id} mysql -u root -proot -e 'show databases;'
-    | grep -q 'information_schema'
-    && (echo 'MySQL running normally' && exit 0)
-    || (echo 'MySQL not running' && exit 1)
-
-  # Check to make sure we can connect to MySQL via TCP.
-  - >
-    sudo docker exec ${container_id} mysql -u root -proot -h 127.0.0.1 -e 'show databases;'
-    | grep -q 'information_schema'
-    && (echo 'MySQL running normally' && exit 0)
-    || (echo 'MySQL not running' && exit 1)
-
-after_failure:
-  # Check MySQL settings.
-  - 'docker exec --tty ${container_id} env TERM=xterm cat /var/log/mysql/error.log'
-  - 'docker exec --tty ${container_id} env TERM=xterm cat /var/log/mysql.err'
-  - 'docker exec --tty ${container_id} env TERM=xterm cat /var/log/mysql.log'
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/

README.md

@@ -29,15 +29,15 @@ The home directory inside which Python MySQL settings will be stored, which Ansi
 
 The MySQL root user account details.
 
-    mysql_root_password_update: no
+    mysql_root_password_update: false
 
 Whether to force update the MySQL root user's password. By default, this role will only change the root user's password when MySQL is first configured. You can force an update by setting this to `yes`.
 
 > Note: If you get an error like `ERROR 1045 (28000): Access denied for user 'root'@'localhost' (using password: YES)` after a failed or interrupted playbook run, this usually means the root password wasn't originally updated to begin with. Try either removing  the `.my.cnf` file inside the configured `mysql_user_home` or updating it and setting `password=''` (the insecure default password). Run the playbook again, with `mysql_root_password_update` set to `yes`, and the setup should complete.
 
 > Note: If you get an error like `ERROR 1698 (28000): Access denied for user 'root'@'localhost' (using password: YES)` when trying to log in from the CLI you might need to run as root or sudoer.
 
-    mysql_enabled_on_startup: yes
+    mysql_enabled_on_startup: true
 
 Whether MySQL should be enabled on startup.
 
@@ -46,7 +46,7 @@ Whether MySQL should be enabled on startup.
 
 The main my.cnf configuration file and include directory.
 
-    overwrite_global_mycnf: yes
+    overwrite_global_mycnf: true
 
 Whether the global my.cnf should be overwritten each time this role is run. Setting this to `no` tells Ansible to only create the `my.cnf` file if it doesn't exist. This should be left at its default value (`yes`) if you'd like to use this role's variables to configure MySQL.
 
@@ -99,7 +99,7 @@ Default MySQL connection configuration.
 
 MySQL logging configuration. Setting `mysql_log` (the general query log) or `mysql_log_error` to `syslog` will make MySQL log to syslog using the `mysql_syslog_tag`.
 
-    mysql_slow_query_log_enabled: no
+    mysql_slow_query_log_enabled: false
     mysql_slow_query_log_file: *default value depends on OS*
     mysql_slow_query_time: 2
 

defaults/main.yml

@@ -10,14 +10,14 @@ mysql_root_home: /root
 mysql_root_username: root
 mysql_root_password: root
 
-# Set this to `yes` to forcibly update the root password.
-mysql_root_password_update: no
-mysql_user_password_update: no
+# Set this to `true` to forcibly update the root password.
+mysql_root_password_update: false
+mysql_user_password_update: false
 
-mysql_enabled_on_startup: yes
+mysql_enabled_on_startup: true
 
-# update my.cnf. each time role is run? yes | no
-overwrite_global_mycnf: yes
+# Whether my.cnf should be updated on every run.
+overwrite_global_mycnf: true
 
 # The following variables have a default value depending on operating system.
 # mysql_config_file: /etc/my.cnf
@@ -37,7 +37,7 @@ mysql_enablerepo: ""
 # MySQL connection settings.
 mysql_port: "3306"
 mysql_bind_address: '0.0.0.0'
-mysql_skip_name_resolve: no
+mysql_skip_name_resolve: false
 mysql_datadir: /var/lib/mysql
 mysql_sql_mode: ''
 # The following variables have a default value depending on operating system.
@@ -48,7 +48,7 @@ mysql_sql_mode: ''
 mysql_log_file_group: mysql
 
 # Slow query log settings.
-mysql_slow_query_log_enabled: no
+mysql_slow_query_log_enabled: false
 mysql_slow_query_time: "2"
 # The following variable has a default value depending on operating system.
 # mysql_slow_query_log_file: /var/log/mysql-slow.log

meta/main.yml

@@ -10,16 +10,20 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-      - 6
-      - 7
+        - 6
+        - 7
     - name: Ubuntu
       versions:
-      - all
+        - all
     - name: Debian
       versions:
-      - all
+        - all
     - name: Archlinux
       versions:
-      - all
+        - all
   galaxy_tags:
     - database
+    - mysql
+    - mariadb
+    - db
+    - sql

molecule/default/molecule.yml

@@ -0,0 +1,27 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
+    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8

molecule/default/playbook.yml

@@ -0,0 +1,16 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  roles:
+    - role: geerlingguy.mysql
+
+  post_tasks:
+    - name: Make sure we can connect to MySQL via Unix socket.
+      command: "mysql -u root -proot -e 'show databases;'"
+      changed_when: false
+
+    - name: Make sure we can connect to MySQL via TCP.
+      command: "mysql -u root -proot -h 127.0.0.1 -e 'show databases;'"
+      changed_when: false

molecule/default/tests/test_default.py

@@ -0,0 +1,14 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'

molecule/default/yaml-lint.yml

@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 150
+    level: warning

tasks/configure.yml

@@ -3,7 +3,7 @@
   command: 'mysql --version'
   register: mysql_cli_version
   changed_when: false
-  check_mode: no
+  check_mode: false
 
 - name: Copy my.cnf global MySQL configuration.
   template:
@@ -39,7 +39,7 @@
   command: "touch {{ mysql_slow_query_log_file }}"
   args:
     creates: "{{ mysql_slow_query_log_file }}"
-    warn: no
+    warn: false
   when: mysql_slow_query_log_enabled
 
 - name: Create datadir if it does not exist
@@ -48,7 +48,7 @@
     state: directory
     owner: mysql
     group: mysql
-    mode:  0755
+    mode: 0755
     setype: mysqld_db_t
 
 - name: Set ownership on slow query log file (if configured).
@@ -64,7 +64,7 @@
   command: "touch {{ mysql_log_error }}"
   args:
     creates: "{{ mysql_log_error }}"
-    warn: no
+    warn: false
   when: mysql_log == "" and mysql_log_error != ""
 
 - name: Set ownership on error log file (if configured).

tasks/replication.yml

@@ -39,7 +39,7 @@
     master_password: "{{ mysql_replication_user.password }}"
     master_log_file: "{{ master.File }}"
     master_log_pos: "{{ master.Position }}"
-  ignore_errors: True
+  ignore_errors: true
   when: >
     ((slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave is failed))
     and (mysql_replication_role == 'slave')

tasks/secure-installation.yml

@@ -15,7 +15,9 @@
     dest: "{{ mysql_user_home }}/.my.cnf"
     owner: "{{ mysql_user_name }}"
     mode: 0600
-  when: mysql_user_name != mysql_root_username and (mysql_install_packages | bool or mysql_user_password_update)
+  when: >
+    mysql_user_name != mysql_root_username
+    and (mysql_install_packages | bool or mysql_user_password_update)
 
 - name: Disallow root login remotely
   command: 'mysql -NBe "{{ item }}"'
@@ -27,7 +29,7 @@
   command: mysql -NBe "SELECT Host FROM mysql.user WHERE User = '{{ mysql_root_username }}' ORDER BY (Host='localhost') ASC"
   register: mysql_root_hosts
   changed_when: false
-  check_mode: no
+  check_mode: false
   when: mysql_install_packages | bool or mysql_root_password_update
 
 # Note: We do not use mysql_user for this operation, as it doesn't always update
@@ -38,15 +40,19 @@
     mysql -u root -NBe
     'ALTER USER "{{ mysql_root_username }}"@"{{ item }}" IDENTIFIED WITH mysql_native_password BY "{{ mysql_root_password }}";'
   with_items: "{{ mysql_root_hosts.stdout_lines|default([]) }}"
-  when: ((mysql_install_packages | bool) or mysql_root_password_update) and ('5.7.' in mysql_cli_version.stdout or '8.0.' in mysql_cli_version.stdout)
+  when: >
+    ((mysql_install_packages | bool) or mysql_root_password_update)
+    and ('5.7.' in mysql_cli_version.stdout or '8.0.' in mysql_cli_version.stdout)
 
 # Set root password for MySQL < 5.7.x.
 - name: Update MySQL root password for localhost root account (< 5.7.x).
   shell: >
     mysql -NBe
     'SET PASSWORD FOR "{{ mysql_root_username }}"@"{{ item }}" = PASSWORD("{{ mysql_root_password }}");'
   with_items: "{{ mysql_root_hosts.stdout_lines|default([]) }}"
-  when: ((mysql_install_packages | bool) or mysql_root_password_update) and ('5.7.' not in mysql_cli_version.stdout and '8.0.' not in mysql_cli_version.stdout)
+  when: >
+    ((mysql_install_packages | bool) or mysql_root_password_update)
+    and ('5.7.' not in mysql_cli_version.stdout and '8.0.' not in mysql_cli_version.stdout)
 
 # Has to be after the root password assignment, for idempotency.
 - name: Copy .my.cnf file with root password credentials.
@@ -62,13 +68,13 @@
   command: mysql -NBe 'SELECT Host FROM mysql.user WHERE User = ""'
   register: mysql_anonymous_hosts
   changed_when: false
-  check_mode: no
+  check_mode: false
 
 - name: Remove anonymous MySQL users.
   mysql_user:
-     name: ""
-     host: "{{ item }}"
-     state: absent
+    name: ""
+    host: "{{ item }}"
+    state: absent
   with_items: "{{ mysql_anonymous_hosts.stdout_lines|default([]) }}"
 
 - name: Remove MySQL test database.

tasks/setup-Debian.yml

@@ -28,6 +28,6 @@
 - name: Delete innodb log files created by apt package after initial install.
   file: path={{ mysql_datadir }}/{{item}} state=absent
   with_items:
-          - "ib_logfile0"
-          - "ib_logfile1"
+    - "ib_logfile0"
+    - "ib_logfile1"
   when: mysql_installed.stat.exists == false

tasks/variables.yml

@@ -4,7 +4,7 @@
   include_vars: "{{ item }}"
   with_first_found:
     - files:
-      - "vars/{{ ansible_os_family }}.yml"
+        - "vars/{{ ansible_os_family }}.yml"
       skip: true
   when: ansible_os_family != "RedHat"