majic-ansible-roles Changeset

Changeset - a01cf82e9a69

Parent rev.

Child rev.

[Not reviewed]

0 4 0

Branko Majic (branko) - 6 years ago 2018-05-21 23:03:30
branko@majic.rs

MAR-129: Updated Molecule to version 2.12.0:

- Updated Molecule to version 2.12.0, alongside its requirements.
- Fixed tests for preseed role to account for new paths on destination
servers (change in Molecule).
- Updated wsgi_website test for pacakges installed in Python virtual
environment.

4 files changed with 12 insertions and 12 deletions:

requirements.in

requirements.txt

roles/preseed/molecule/default/tests/test_parameters_mandatory.py

roles/wsgi_website/molecule/default/tests/test_parameters_optional.py

0 comments (0 inline, 0 general)

requirements.in

➞

Show inline comments

 ansible~=2.3.0
 dnspython
-molecule~=2.4.0
+molecule~=2.12.0
 paramiko
 pip-tools
 python-vagrant
@@ \ No newline at end of file @@
 python-vagrant

requirements.txt

➞

Show inline comments

@@ @@ -4,7 +4,7 @@ @@
+#
 #    pip-compile --output-file requirements.txt requirements.in
+#
-ansible-lint==3.4.17      # via molecule
+ansible-lint==3.4.19      # via molecule
 ansible==2.3.3.0
 anyconfig==0.9.1          # via molecule
 arrow==0.12.1             # via jinja2-time
@@ @@ -13,6 +13,7 @@ attrs==18.1.0 # via pytest @@
 backports.functools-lru-cache==1.5  # via arrow
 bcrypt==3.1.4             # via paramiko
 binaryornot==0.4.4        # via cookiecutter
 cerberus==1.1             # via molecule
 cffi==1.11.5              # via bcrypt, cryptography, pynacl
 chardet==3.0.4            # via binaryornot
 click-completion==0.2.1   # via molecule
@@ @@ -32,11 +33,10 @@ git-url-parse==1.1.0 # via python-gilt @@
 idna==2.6                 # via cryptography
 ipaddress==1.0.22         # via cryptography
 jinja2-time==0.2.0        # via cookiecutter
-jinja2==2.9.6             # via ansible, click-completion, cookiecutter, jinja2-time, molecule
+jinja2==2.10              # via ansible, click-completion, cookiecutter, jinja2-time, molecule
 markupsafe==1.0           # via jinja2
 marshmallow==2.13.5       # via molecule
 mccabe==0.6.1             # via flake8
-molecule==2.4.0
+molecule==2.12.1
 monotonic==1.5            # via fasteners
 more-itertools==4.1.0     # via pytest
 paramiko==2.4.1
@@ @@ -64,6 +64,6 @@ sh==1.12.14 # via molecule, python-gilt @@
 six==1.11.0               # via ansible-lint, bcrypt, click-completion, cryptography, fasteners, more-itertools, pip-tools, pynacl, pytest, python-dateutil, testinfra
 tabulate==0.7.7           # via molecule
 testinfra==1.7.1          # via molecule
-tree-format==0.1.1        # via molecule
+tree-format==0.1.2        # via molecule
 whichcraft==0.4.1         # via cookiecutter
-yamllint==1.8.1           # via molecule
+yamllint==1.11.0          # via molecule

roles/preseed/molecule/default/tests/test_parameters_mandatory.py

➞

Show inline comments

@@ @@ -15,7 +15,7 @@ def test_preseed_directory(host): @@
     with host.sudo():
         # Preseed directory created at same level as inventory.
-        preseed_directory = host.file(os.path.join(os.getcwd(), ".molecule", 'preseed_files'))
+        preseed_directory = host.file(os.path.join('/tmp/molecule/preseed/default', 'preseed_files'))
         assert preseed_directory.is_directory
         assert preseed_directory.mode == 0o750
@@ @@ -29,7 +29,7 @@ def test_preseed_configuration_files(host): @@
     with host.sudo():
         # Preseed directory created at same level as inventory.
-        preseed_directory_path = os.path.join(os.getcwd(), ".molecule", 'preseed_files')
+        preseed_directory_path = os.path.join('/tmp/molecule/preseed/default', 'preseed_files')
         # Verify that preseed configuration files are created for all hosts.
         for testinfra_host in testinfra_hosts:
@@ @@ -48,7 +48,7 @@ def test_preseed_configuration_file_content(host): @@
     hostname = host.run('hostname').stdout
     with host.sudo():
-        preseed_file = host.file(os.path.join(os.getcwd(), ".molecule", "preseed_files", "%s.cfg" % hostname))
+        preseed_file = host.file(os.path.join("/tmp/molecule/preseed/default", "preseed_files", "%s.cfg" % hostname))
         preseed_file_content = preseed_file.content_string
         ssh_public_key = open(os.path.join(os.path.expanduser("~"), ".ssh", "id_rsa.pub")).read().strip()

roles/wsgi_website/molecule/default/tests/test_parameters_optional.py

➞

Show inline comments

@@ @@ -259,7 +259,7 @@ docopt==0.6.2 @@
 futures==3.1.0
 gunicorn==19.7.0
 jedi==0.12.0
-parso==0.2.0
+parso==0.2.1
 prompt-toolkit==1.0.15
 ptpython==0.41
 six==1.11.0

0 comments (0 inline, 0 general)