Merge pull request #5 from pycontribs/devel

Minor improvements

Author: ssbarnea

ansible.cfg

@@ -0,0 +1,3 @@
+[defaults]
+ansible_python_interpreter = auto_silent
+retry_files_enabled = False

pytest.ini

@@ -0,0 +1,2 @@
+[pytest]
+addopts=-p no:flaky

pytest_molecule.py

@@ -38,7 +38,10 @@ def pytest_collect_file(parent, path):
 
 class MoleculeFile(pytest.File):
     def collect(self):
-        yield MoleculeItem("", self)
+        yield MoleculeItem('test', self)
+
+    def __str__(self):
+        return str(self.fspath.relto(os.getcwd()))
 
 
 class MoleculeItem(pytest.Item):
@@ -50,21 +53,36 @@ def runtest(self):
         cwd = os.path.abspath(os.path.join(self.fspath.dirname, '../..'))
         scenario = folders[-1]
         role = folders[-3]  # noqa
-
-        cmd = ['python', '-m', 'molecule', 'test', '-s', scenario]
+        cmd = [sys.executable, '-m', 'molecule', self.name, '-s', scenario]
         print("running: %s (from %s)" % (" " .join(cmd), cwd))
-        # Workaround for STDOUT/STDERR line ordering issue:
-        # https://github.com/pytest-dev/pytest/issues/5449
-        p = subprocess.Popen(
-            cmd,
-            cwd=cwd,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.STDOUT,
-            universal_newlines=True)
-        for line in p.stdout:
-            print(line, end="")
-        p.wait()
-        assert p.returncode == 0
+
+        try:
+            # Workaround for STDOUT/STDERR line ordering issue:
+            # https://github.com/pytest-dev/pytest/issues/5449
+            p = subprocess.Popen(
+                cmd,
+                cwd=cwd,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.STDOUT,
+                universal_newlines=True)
+            for line in p.stdout:
+                print(line, end="")
+            p.wait()
+            if p.returncode != 0:
+                pytest.fail(
+                    "Error code %s returned by: %s" % (
+                        p.returncode, " ".join(cmd)),
+                    pytrace=False)
+        except Exception as e:
+            pytest.fail(
+                "Exception %s returned by: %s" % (e, " ".join(cmd)),
+                pytrace=False)
+
+    def reportinfo(self):
+        return self.fspath, 0, "usecase: %s" % self.name
+
+    def __str__(self):
+        return self.name
 
 
 class MoleculeException(Exception):

tests/roles/myrole/molecule/default/molecule.yml

@@ -1,7 +1,7 @@
 ---
 driver:
   name: docker
-log: true
+
 platforms:
 
   - name: centos7-master
@@ -13,12 +13,14 @@ provisioner:
   name: ansible
   env:
     ANSIBLE_STDOUT_CALLBACK: yaml
-    ANSIBLE_VERBOSITY: "2"
+  log: true
+
 scenario:
   test_sequence:
     - destroy
     - create
     - converge
     - destroy
+
 lint:
   enabled: false

tests/roles/myrole/molecule/other/molecule.yml

@@ -0,0 +1 @@
+../default/molecule.yml

tests/roles/myrole/molecule/other/playbook.yml

@@ -0,0 +1 @@
+../default/playbook.yml

tox.ini

@@ -10,6 +10,7 @@ deps =
     pytest-html>=1.21.0
     selinux>=0.1.5rc1
 commands =
+    pytest --collect-only -q
     pytest --color=yes --html={envlogdir}/reports.html --self-contained-html {tty:-s} {posargs:tests}
 setenv =
     ANSIBLE_FORCE_COLOR={env:ANSIBLE_FORCE_COLOR:1}