Replace assertPrem

Author: snejus

test/plugins/test_permissions.py

@@ -6,7 +6,6 @@
 
 from beets.test._common import touch
 from beets.test.helper import AsIsImporterMixin, ImportTestCase, PluginMixin
-from beets.util import displayable_path
 from beetsplug.permissions import (
     check_permissions,
     convert_perm,
@@ -23,57 +22,25 @@ def setUp(self):
         self.config["permissions"] = {"file": "777", "dir": "777"}
 
     def test_permissions_on_album_imported(self):
-        self.do_thing(True)
+        self.import_and_check_permissions()
 
     def test_permissions_on_item_imported(self):
         self.config["import"]["singletons"] = True
-        self.do_thing(True)
+        self.import_and_check_permissions()
 
-    @patch("os.chmod", Mock())
-    def test_failing_to_set_permissions(self):
-        self.do_thing(False)
-
-    def do_thing(self, expect_success):
+    def import_and_check_permissions(self):
         if platform.system() == "Windows":
             self.skipTest("permissions not available on Windows")
 
-        def get_stat(v):
-            return (
-                os.stat(os.path.join(self.temp_dir, b"import", *v)).st_mode
-                & 0o777
-            )
-
-        typs = ["file", "dir"]
-
-        track_file = (b"album", b"track_1.mp3")
-        self.exp_perms = {
-            True: {
-                k: convert_perm(self.config["permissions"][k].get())
-                for k in typs
-            },
-            False: {k: get_stat(v) for (k, v) in zip(typs, (track_file, ()))},
-        }
+        track_file = os.path.join(self.import_dir, b"album", b"track_1.mp3")
+        assert os.stat(track_file).st_mode & 0o777 != 511
 
         self.run_asis_importer()
         item = self.lib.items().get()
 
-        self.assertPerms(item.path, "file", expect_success)
-
-        for path in dirs_in_library(self.lib.directory, item.path):
-            self.assertPerms(path, "dir", expect_success)
-
-    def assertPerms(self, path, typ, expect_success):
-        for x in [
-            (True, self.exp_perms[expect_success][typ], "!="),
-            (False, self.exp_perms[not expect_success][typ], "=="),
-        ]:
-            msg = "{} : {} {} {}".format(
-                displayable_path(path),
-                oct(os.stat(path).st_mode),
-                x[2],
-                oct(x[1]),
-            )
-            assert x[0] == check_permissions(path, x[1]), msg
+        paths = (item.path, *dirs_in_library(self.lib.directory, item.path))
+        for path in paths:
+            assert os.stat(path).st_mode & 0o777 == 511
 
     def test_convert_perm_from_string(self):
         assert convert_perm("10") == 8