Merge pull request saltstack#49167 from dwoz/filefix

Fix remaining file state integration tests (py3)
dwoz · Aug 17, 2018 · a18d937 · a18d937
1 parent 8bda1e5
commit a18d937
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/salt/states/file.py b/salt/states/file.py
@@ -2987,7 +2987,7 @@ def directory(name,
                   perms: full_control
             - win_inheritance: False
     '''
-    name = os.path.expanduser(name)
+    name = os.path.normcase(os.path.expanduser(name))
     ret = {'name': name,
            'changes': {},
            'pchanges': {},
@@ -3515,7 +3515,7 @@ def recurse(name,
         # "env" is not supported; Use "saltenv".
         kwargs.pop('env')
 
-    name = os.path.expanduser(sdecode(name))
+    name = os.path.normcase(os.path.expanduser(sdecode(name)))
 
     user = _test_owner(kwargs, user=user)
     if salt.utils.platform.is_windows():

diff --git a/tests/integration/states/test_file.py b/tests/integration/states/test_file.py
@@ -267,7 +267,7 @@ def test_managed_file_mode(self):
 
         if IS_WINDOWS:
             expected = 'The \'mode\' option is not supported on Windows'
-            self.assertEqual(ret[ret.keys()[0]]['comment'], expected)
+            self.assertEqual(ret[list(ret)[0]]['comment'], expected)
             self.assertSaltFalseReturn(ret)
             return
 
@@ -303,7 +303,7 @@ def test_managed_file_mode_file_exists_replace(self):
 
         if IS_WINDOWS:
             expected = 'The \'mode\' option is not supported on Windows'
-            self.assertEqual(ret[ret.keys()[0]]['comment'], expected)
+            self.assertEqual(ret[list(ret)[0]]['comment'], expected)
             self.assertSaltFalseReturn(ret)
             return
 
@@ -335,7 +335,7 @@ def test_managed_file_mode_file_exists_noreplace(self):
 
         if IS_WINDOWS:
             expected = 'The \'mode\' option is not supported on Windows'
-            self.assertEqual(ret[ret.keys()[0]]['comment'], expected)
+            self.assertEqual(ret[list(ret)[0]]['comment'], expected)
             self.assertSaltFalseReturn(ret)
             return
 
@@ -418,7 +418,7 @@ def test_managed_dir_mode(self):
         )
         if IS_WINDOWS:
             expected = 'The \'mode\' option is not supported on Windows'
-            self.assertEqual(ret[ret.keys()[0]]['comment'], expected)
+            self.assertEqual(ret[list(ret)[0]]['comment'], expected)
             self.assertSaltFalseReturn(ret)
             return