Updated Molecule to 3.0.8 (#110)

freemanjp · web-flow · commit 062fa7a30ca5 · 2020-09-13T13:21:45.000+01:00
Keeping up with the latest changes.
diff --git a/.ansible-lint b/.ansible-lint
@@ -0,0 +1,2 @@
+skip_list:
+  - '106'  # Role name {} does not match ``^[a-z][a-z0-9_]+$`` pattern'
diff --git a/.moleculew/ansible_lint_version b/.moleculew/ansible_lint_version
@@ -0,0 +1 @@
+4.3.4
diff --git a/.moleculew/docker_lib_version b/.moleculew/docker_lib_version
@@ -0,0 +1 @@
+4.3.1
diff --git a/.moleculew/flake8_version b/.moleculew/flake8_version
@@ -0,0 +1 @@
+3.8.3
diff --git a/.moleculew/molecule_version b/.moleculew/molecule_version
@@ -1 +1 @@
-2.22
+3.0.8
diff --git a/.moleculew/python_version b/.moleculew/python_version
@@ -1 +1 @@
-2.7.15
+3.6.7
diff --git a/.moleculew/testinfra_version b/.moleculew/testinfra_version
@@ -0,0 +1 @@
+5.3.1
diff --git a/.moleculew/yamllint_version b/.moleculew/yamllint_version
@@ -0,0 +1 @@
+1.24.2
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 ---
 language: python
-python: '2.7'
+python: '3.6'
 
 env:
   global:
diff --git a/molecule/default/Dockerfile.j2 b/molecule/default/Dockerfile.j2
diff --git a/molecule/default/INSTALL.rst b/molecule/default/INSTALL.rst
@@ -19,4 +19,4 @@ widely recommended `'--user' flag`_ when invoking ``pip``.
 
 .. code-block:: bash
 
-    $ pip install 'molecule[docker]'
+    $ python3 -m pip install 'molecule[docker]'
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -3,6 +3,13 @@
   hosts: all
 
   pre_tasks:
+
+    - name: update apt cache
+      apt:
+        update_cache: yes
+      when: ansible_os_family == 'Debian'
+      changed_when: no
+
     - name: create test users
       become: yes
       user:
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -5,8 +5,11 @@ dependency:
 driver:
   name: docker
 
-lint:
-  name: yamllint
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
+  flake8
 
 platforms:
   - name: ansible-role-oh-my-zsh-debian-min
@@ -26,13 +29,6 @@ platforms:
 
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
-
-scenario:
-  name: default
 
 verifier:
   name: testinfra
-  lint:
-    name: flake8
diff --git a/molecule/default/tests/conftest.py b/molecule/default/tests/conftest.py
@@ -0,0 +1,23 @@
+"""PyTest Fixtures."""
+from __future__ import absolute_import
+
+import os
+
+import pytest
+
+
+def pytest_runtest_setup(item):
+    """Run tests only when under molecule with testinfra installed."""
+    try:
+        import testinfra
+    except ImportError:
+        pytest.skip("Test requires testinfra", allow_module_level=True)
+    if "MOLECULE_INVENTORY_FILE" in os.environ:
+        pytest.testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+            os.environ["MOLECULE_INVENTORY_FILE"]
+        ).get_hosts("all")
+    else:
+        pytest.skip(
+            "Test should run only from inside molecule.",
+            allow_module_level=True
+        )
diff --git a/molecule/default/tests/test_role.py b/molecule/default/tests/test_role.py
@@ -1,12 +1,5 @@
 import pytest
 
-import os
-
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
-
 
 @pytest.mark.parametrize('username', [
     'test_usr1',
diff --git a/moleculew b/moleculew

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+skip_list:`
	`2`	+ - '106' # Role name {} does not match ``^[a-z][a-z0-9_]+$`` pattern'