fix: Fix tests on Windows

kluctl · Oct 11, 2021 · b767fc0 · b767fc0
1 parent 89b5f78
commit b767fc0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/kluctl/tests/includes/test_includes.py b/kluctl/tests/includes/test_includes.py
@@ -7,7 +7,7 @@
 
 class TestIncludes(DeploymentTestBase):
     def build_fixed_deployment(self):
-        return self.build_deployment("includes/test_deployment")
+        return self.build_deployment(os.path.join("includes", "test_deployment"))
 
     def test_simple(self):
         self.assertEqual(len(self.d.includes), 2)

diff --git a/kluctl/tests/templating/test_templating.py b/kluctl/tests/templating/test_templating.py
@@ -14,49 +14,49 @@ def get_jinja2_vars(self):
         }
 
     def test_deployment_yml(self):
-        with self.build_deployment('templating/test_deployment', self.get_jinja2_vars(), {'a': 'a2'}) as (d, c):
+        with self.build_deployment(os.path.join('templating', 'test_deployment'), self.get_jinja2_vars(), {'a': 'a2'}) as (d, c):
             self.assertEqual(len(d.includes), 2)
             self.assertListEqual(d.conf['tags'], ['a1', 'a2'])
 
     def test_include_var(self):
-        with self.build_deployment('templating/test_deployment', self.get_jinja2_vars(), {'a': 'a2'}) as (d, c):
+        with self.build_deployment(os.path.join('templating', 'test_deployment'), self.get_jinja2_vars(), {'a': 'a2'}) as (d, c):
             self.assertEqual(d.includes[0].dir, os.path.join(cur_dir, 'test_deployment', 'd1'))
 
     def test_not_rendered_kustomize_resource(self):
-        with self.render_deployment('templating/test_deployment', self.get_jinja2_vars(), {'a': 'a2'}) as c:
+        with self.render_deployment(os.path.join('templating', 'test_deployment'), self.get_jinja2_vars(), {'a': 'a2'}) as c:
             y = yaml_load_file(os.path.join(c.tmpdir, 'd1/k1/not-rendered.yml'))
             self.assertEqual(y['a'], '{{ a }}')
 
     def test_rendered_kustomize_resource(self):
-        with self.render_deployment('templating/test_deployment', self.get_jinja2_vars(), {'a': 'a2'}) as c:
+        with self.render_deployment(os.path.join('templating', 'test_deployment'), self.get_jinja2_vars(), {'a': 'a2'}) as c:
             y = yaml_load_file(os.path.join(c.tmpdir, 'd1/k1/rendered.yml'))
             self.assertEqual(y['a'], 'a1')
 
     def test_load_template(self):
-        with self.render_deployment('templating/test_deployment', self.get_jinja2_vars(), {'a': 'a2'}) as c:
+        with self.render_deployment(os.path.join('templating', 'test_deployment'), self.get_jinja2_vars(), {'a': 'a2'}) as c:
             y = yaml_load_file(os.path.join(c.tmpdir, 'd1/k1/rendered.yml'))
             self.assertEqual(y['b'], 'test a1')
             self.assertEqual(y['c'], 'test a1')
 
     def test_rendered_kustomization_yml(self):
-        with self.render_deployment('templating/test_deployment', self.get_jinja2_vars(), {'a': 'a2'}) as c:
+        with self.render_deployment(os.path.join('templating', 'test_deployment'), self.get_jinja2_vars(), {'a': 'a2'}) as c:
             y = yaml_load_file(os.path.join(c.tmpdir, 'd1/k1/kustomization.yml'))
             self.assertListEqual(y['resources'], ['b1'])
 
     def test_import_no_context(self):
-        with self.render_deployment('templating/test_import', self.get_jinja2_vars(), {}) as c:
+        with self.render_deployment(os.path.join('templating', 'test_import'), self.get_jinja2_vars(), {}) as c:
             y = yaml_load_file(os.path.join(c.tmpdir, 'k1/rendered.yml'))
             self.assertEqual(y['a'], 'a1')
 
     def test_get_var(self):
-        with self.render_deployment('templating/test_utils', self.get_jinja2_vars(), {}) as c:
+        with self.render_deployment(os.path.join('templating', 'test_utils'), self.get_jinja2_vars(), {}) as c:
             y = yaml_load_file(os.path.join(c.tmpdir, 'k1/get_var.yml'))
             self.assertEqual(y['test1'], 'default')
             self.assertEqual(y['test2'], 'default')
             self.assertEqual(y['test3'], 'a')
 
     def test_vars(self):
-        with self.render_deployment('templating/test_vars', self.get_jinja2_vars(), {}) as c:
+        with self.render_deployment(os.path.join('templating', 'test_vars'), self.get_jinja2_vars(), {}) as c:
             y = yaml_load_file(os.path.join(c.tmpdir, 'k1/test.yml'))
             self.assertEqual(y['test1'], 'v1')
             self.assertEqual(y['test2'], 'f1')