temp: adapt struct layout test for sunOS only

Author: ThomasWaldmann

.github/workflows/tests.yml

@@ -155,23 +155,18 @@ jobs:
               python3 "$file" -h
           done
 
-      - name: Only test struct layout (MacOS)
-        if: startsWith( matrix.os, 'macos' )
-        run: |
-          python3 -m pytest -s -v -rs tests/test_struct_layout.py
-
       - name: Unit Tests (FUSE 2)
         if: startsWith( matrix.os, 'ubuntu' )
         run: |
           python3 -c 'import mfusepy; assert mfusepy.fuse_version_major == 2'
-          python3 -m pytest -v -rs tests
+          python3 -m pytest -v -rs -k "not struct_layout" tests
 
       - name: Unit Tests (FUSE 3)
         if: startsWith( matrix.os, 'ubuntu' )
         run: |
           export FUSE_LIBRARY_PATH=$( dpkg -L libfuse3-3 | 'grep' -F .so | head -1 )
           python3 -c 'import mfusepy; assert mfusepy.fuse_version_major == 3'
-          python3 -m pytest -v -rs tests
+          python3 -m pytest -v -rs -k "not struct_layout" tests
 
       - name: Test Compatibility (Ratarmount)
         if: startsWith( matrix.os, 'ubuntu' )
@@ -261,7 +256,7 @@ jobs:
 
                 # Unit Tests (FUSE 2)
                 python3 -c 'import mfusepy; assert mfusepy.fuse_version_major == 2'
-                python3 -m pytest -s -v -rs tests
+                python3 -m pytest -s -v -rs -k "not struct_layout" tests
                 ;;
               openbsd)
                 # Ensure a proper hostname/FQDN is set (VMs may not have one by default)
@@ -285,7 +280,7 @@ jobs:
                 python3 -c 'import mfusepy; assert mfusepy.fuse_version_major == 2'
 
                 # FUSE mounting only works as root on OpenBSD
-                sudo -E .venv/bin/python3 -m pytest -s -v -rs tests
+                sudo -E .venv/bin/python3 -m pytest -s -v -rs -k "not struct_layout" tests
                 ;;
               netbsd)
                 # Ensure a proper hostname/FQDN is set (VMs may not have one by default)
@@ -317,9 +312,8 @@ jobs:
 
                 # preserve pytest exit status, always show logs
                 rc=0
-                python3 -m pytest -s -v -rs tests/test_struct_layout.py
                 # for now, run the tests as root, too many PermissionErrors:
-                sudo -E python3 -m pytest -s -v -rs tests || rc=$?
+                sudo -E python3 -m pytest -s -v -rs -k "not struct_layout" tests || rc=$?
                 exit "$rc"
                 ;;
               omnios)

tests/test_struct_layout.py

@@ -4,6 +4,7 @@
 import pprint
 import shutil
 import subprocess
+import sys
 import tempfile
 from pathlib import Path
 
@@ -43,17 +44,19 @@
         'f_frsize',
         'f_fsid',
         'f_namemax',
+        'f_basetype',
+        'f_str',
     ],
-    'fuse_context': ['fuse', 'uid', 'gid', 'pid', 'umask'],
+    'fuse_context': ['fuse', 'uid', 'gid', 'pid'],  # 'umask'
     'fuse_conn_info': [
         'proto_major',
         'proto_minor',
         'max_write',
         'max_readahead',
-        'capable',
-        'want',
-        'max_background',
-        'congestion_threshold',
+        # 'capable',
+        # 'want',
+        # 'max_background',
+        # 'congestion_threshold',
     ],
     'fuse_operations': [
         'getattr',