Merge pull request #43 from taoistmath/DEVOPS-12019

DEVOPS-12019: updated list of possible failures
dandb · Jan 25, 2019 · 4e9354e · 4e9354e
2 parents 7ad5b65 + 1201192
commit 4e9354e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,9 @@ python:
   - "2.7"
 install:
   - pip install -r tests/requirements.txt
-  - pip install coveralls
+  - pip install pycparser==2.18
+  - pip install idna==2.6
+  - pip install coveralls==1.2.0
 script: 
   - coverage run --source . setup.py nosetests 
 after_success:

diff --git a/requirements.txt b/requirements.txt
@@ -3,3 +3,4 @@ boto3
 pyaml
 troposphere[policy]==2.0.2
 redis
+cryptography==2.1.4
diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@ def get_cmdclass(needs_install):
 
 setup(
     name="salt-sit",
-    version="0.0.2",
+    version="0.0.3",
     author="Dun and Bradstreet",
     author_email="sit.dandb@gmail.com",
     description=('Salt Integration Testing Tool -- applies role configurations to Docker container minions using AWS (Amazon Web Services) ECS (EC2 Container Service)'),

diff --git a/sit/launch_review_job.py b/sit/launch_review_job.py
@@ -223,7 +223,8 @@ def highstate_failed(self, result):
                 'Data failed to compile:',
                 'Pillar failed to render with the following messages:',
                 'Detected conflicting IDs',
-                'Cannot extend ID'
+                'Cannot extend ID',
+                'not available on the salt master or through a configured fileserver'
             ]
             failures = [failure in result for failure in possible_failures]
             if True not in failures:

diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -4,4 +4,4 @@ boto3
 pyaml
 mock
 troposphere==2.0.2
-fakeredis
+fakeredis==0.9.0