run faster tests and more resilient

undu · Oct 22, 2015 · 01328c0 · 01328c0
1 parent 38c5d1d
commit 01328c0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,5 @@
 language: python
+sudo: false
 install:
   - pip install tox
 script:

diff --git a/tests/render-test.py b/tests/render-test.py
@@ -68,13 +68,14 @@ def test_env(self):
         self._testme(['--format=env', 'resources/nginx-env.j2'], env=env)
 
     def test_glob(self):
-        self.assertEqual('[\'resources/nginx-env\', \'resources/nginx-env2\']',
-                         render_command(os.getcwd(),
-                                        {},
-                                        None,
-                                        ['-g',
-                                         'resources/nginx-env*.j2',
-                                         'resources/data.env']))
+        self.assertTrue(render_command(os.getcwd(),
+                                       {},
+                                       None,
+                                       ['-g',
+                                        'resources/nginx-env*.j2',
+                                        'resources/data.env']) in
+                        ['[\'resources/nginx-env\', \'resources/nginx-env2\']',
+                         '[\'resources/nginx-env2\', \'resources/nginx-env\']'])
         with open('resources/nginx-env', 'r') as f:
             self.assertEqual(self.expected_output,
                              f.read())