selftest: skip smb2.ioctl tests on ntvfs

[nivanova/samba-autobuild/.git] / selftest / socket_wrapper.py

diff --git a/selftest/socket_wrapper.py b/selftest/socket_wrapper.py
index a45645234a5e7c26175b88f2320f6bd216cdffcd..371bad958f2a0d25e0bd5c6e641eea4693521937 100644 (file)
--- a/selftest/socket_wrapper.py
+++ b/selftest/socket_wrapper.py
@@ -21,6 +21,13 @@ import os
 import shutil
 
 def setup_dir(dir, pcap):
+    """Setup a socket wrapper directory.
+
+    :param dir: Socket wrapper directory (None if socket wrapper should be
+        disabled)
+    :param pcap: Whether to generate pcap files
+    :return: The socket wrapper directory
+    """
     pcap_dir = None
 
     if dir is not None:
@@ -28,7 +35,7 @@ def setup_dir(dir, pcap):
             shutil.rmtree(dir)
         os.mkdir(dir, 0777)
 
-        if pcap is not None:
+        if pcap:
             pcap_dir = os.path.join(dir, "pcap")
 
             if os.path.isdir(pcap_dir):
@@ -51,4 +58,4 @@ def setup_pcap(pcap_file):
     os.environ["SOCKET_WRAPPER_PCAP_FILE"] = pcap_file
 
 def set_default_iface(i):
-    os.environ["SOCKET_WRAPPER_DEFAULT_IFACE"] = i
+    os.environ["SOCKET_WRAPPER_DEFAULT_IFACE"] = str(i)