cleanup tests

Author: j-keck

tests/browser_tests/tests.py

@@ -3,62 +3,48 @@
 from typing import Any
 from selenium import webdriver # type: ignore
 import sys
-import subprocess
 
-from browser_tests import zfs
-from browser_tests import fs
+import fs
 from browser_tests.page import Page
+from zfs import ZFS
 
 class Tests(unittest.TestCase):
-    pool: str
-    dataset = "zsd-browser-test"
-    mountpoint: str
-
-    @classmethod
-    def setUpClass(cls) -> None:
-        # use the first found zfs pool (dirty, unsafe code!)
-        cls.pool = subprocess.run(["sudo", "zpool", "list", "-Ho", "name"]
-                                  , text=True
-                                  , capture_output=True).stdout.strip()
-
-        # create test dataset
-        cls.mountpoint = zfs.createDataset(cls.pool, cls.dataset)
-
+    zfs = ZFS()
 
     def setUp(self) -> None:
         self.page = Page(headless = True)
         self.assertIn("ZFS-Snap-Diff", self.page.title())
 
 
     def testActualFileContent(self) -> None:
-        fs.createTestFile(self.mountpoint + "/file.txt",
+        fs.createTestFile(self.zfs.mountpoint() + "/file.txt",
                              ["firstline", "secondline", "thirdline"]
         )
 
         self.page.selectView("Browse filesystem")
-        self.page.selectDataset(self.dataset)
+        self.page.selectDataset(self.zfs.dataset)
         self.page.findByXPath("//td[contains(.,'file.txt')]").click()
         self.assertIn("Current content of file.txt", self.page.findById("file-actions-header").text)
-        self.assertIn("firstline\nsecondline\nthirdline", self.page.findById("file-actions-body").text)
+        self.assertIn("firstline\nsecondline\nthirdline", self.page.findByCSS("#file-actions-body > pre > code").text)
 
 
     def testCreateSnapshotInBrowseFilesystem(self) -> None:
         self.page.selectView("Browse filesystem")
-        self.page.selectDataset(self.dataset)
+        self.page.selectDataset(self.zfs.dataset)
         self.page.createSnapshot("create-snapshot-in-browse-filesystem")
         self.assertIn("@create-snapshot-in-browse-filesystem' created", self.page.alertText())
 
 
     def testCreateSnapshotInBrowseSnapshots(self) -> None:
         self.page.selectView("Browse snapshots")
-        self.page.selectDataset(self.dataset)
+        self.page.selectDataset(self.zfs.dataset)
         self.page.createSnapshot("create-snapshot-in-browse-snapshots")
         self.assertIn("@create-snapshot-in-browse-snapshots' created", self.page.alertText())
 
 
     def testDestroySnapshot(self) -> None:
         self.page.selectView("Browse snapshots")
-        self.page.selectDataset(self.dataset)
+        self.page.selectDataset(self.zfs.dataset)
 
 
         # create snapshot
@@ -73,7 +59,7 @@ def testDestroySnapshot(self) -> None:
 
     def testRenameSnapshot(self) -> None:
         self.page.selectView("Browse snapshots")
-        self.page.selectDataset(self.dataset)
+        self.page.selectDataset(self.zfs.dataset)
 
         # create snapshot
         self.page.createSnapshot("rename-snapshot")
@@ -87,41 +73,37 @@ def testRenameSnapshot(self) -> None:
 
     def testCloneSnapshot(self) -> None:
         self.page.selectView("Browse snapshots")
-        self.page.selectDataset(self.dataset)
+        self.page.selectDataset(self.zfs.dataset)
 
         # create snapshot
         self.page.createSnapshot("clone-snapshot")
         self.page.closeAlert()
 
         # clone snapshot
         self.page.cloneSnapshot("clone-snapshot", "cloned")
-        self.assertIn("Snapshot 'clone-snapshot' cloned to '"+self.pool+"/cloned'", self.page.alertText())
+        self.assertIn("Snapshot 'clone-snapshot' cloned to '"+self.zfs.pool+"/cloned'", self.page.alertText())
         self.page.closeAlert()
 
 
     def testRollbackSnapshot(self) -> None:
         self.page.selectView("Browse snapshots")
-        self.page.selectDataset(self.dataset)
+        self.page.selectDataset(self.zfs.dataset)
 
         # create snapshot
         self.page.createSnapshot("rollback-snapshot")
         self.assertIn("@rollback-snapshot' created", self.page.alertText())
         self.page.closeAlert()
 
         # create a file
-        fs.createTestFile(self.mountpoint + "/rollback-test.txt", ["dummy"])
-        self.assertTrue(fs.exists(self.mountpoint + "/rollback-test.txt"))
+        fs.createTestFile(self.zfs.mountpoint() + "/rollback-test.txt", ["dummy"])
+        self.assertTrue(fs.exists(self.zfs.mountpoint() + "/rollback-test.txt"))
 
         # rollback
         self.page.rollbackSnapshot("rollback-snapshot")
         self.assertIn("Snapshot 'rollback-snapshot' rolled back", self.page.alertText())
-        self.assertFalse(fs.exists(self.mountpoint + "/rollback-test.txt"))
+        self.assertFalse(fs.exists(self.zfs.mountpoint() + "/rollback-test.txt"))
 
 
     def tearDown(self) -> None:
         self.page.close()
 
-
-    @classmethod
-    def tearDownClass(cls) -> None:
-        zfs.destroyDataset(cls.pool, cls.dataset)

tests/browser_tests/zfs.py

@@ -1,11 +1,18 @@
 import unittest
+from zfs import ZFS
+import fs
 
 def main() -> None:
+    zfs = ZFS()
+    zfs.createDataset()
+
     loader = unittest.TestLoader()
     tests = loader.discover('.')
     testRunner = unittest.runner.TextTestRunner()
     testRunner.run(tests)
 
+    zfs.destroyDataset()
+
 
 if __name__ == "__main__":
     main()

tests/browser_tests/fs.py renamed to tests/fs.py

@@ -0,0 +1,46 @@
+from typing import Any, Union, List
+import subprocess
+import os
+
+
+class ZFS:
+    pool: str
+    dataset: str
+
+    def __init__(self, dataset: str = "zsd-e2e-test") -> None:
+        self.pool = self.lookupPool()
+        self.dataset = dataset
+
+
+    def mountpoint(self) -> str:
+        return "/tmp/{}".format(self.dataset)
+
+
+    def createDataset(self) -> None:
+        args = "create -o mountpoint={} {}/{}".format(self.mountpoint(), self.pool, self.dataset)
+        self.zfs(args)
+
+        # fix permission
+        username = os.getlogin()
+        subprocess.run(["sudo", "chown", username, self.mountpoint()])
+
+
+    def destroyDataset(self) -> None:
+        self.zfs("destroy -R {}/{}".format(self.pool, self.dataset))
+
+
+    @classmethod
+    def zfs(cls, args: Union[str, List[str]]) -> None:
+        if isinstance(args, str):
+            args = args.split()
+        subprocess.run(["sudo", "zfs"] + args)
+
+
+    @classmethod
+    def lookupPool(cls) -> str:
+        # dirty, unsafe code!
+        out = subprocess.run(["sudo", "zpool", "list", "-Ho", "name"]
+                             , text=True
+                             , capture_output=True).stdout
+        return out.strip()
+