[sanlock] branch master updated (b7b0fe9 -> 19a07f6)

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

teigland pushed a change to branch master
in repository sanlock.

      from  b7b0fe9   Start the daemon tests module
       new  20b3d31   Add vim configuration
       new  70bdc86   Extract start_sanlock_deamon() helper
       new  ced9ae9   Start new daemon for every test
       new  95873c9   Add tests for sanlock lockfile
       new  97358a6   Do not unlink sanlock lockfile on shutdown
       new  c46aa2e   Normalize sanlock exit code
       new  fc4f190   Introduce tests.util module
       new  95093da   Introduce conftest module
       new  6be1f4f   Move environment setup to a shell script
       new  c7fd1b6   Fix libsanlock build on Unubtu/Debian
       new  19a07f6   Start python binding test module

The 11 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .travis.yml                              |  5 +--
 .vimrc                                   |  4 ++
 README.dev                               |  9 ++--
 python/Makefile                          |  3 ++
 src/Makefile                             |  4 +-
 src/lockfile.c                           | 10 -----
 src/lockfile.h                           |  1 -
 src/main.c                               |  4 +-
 tests/__init__.py                        |  0
 tests/conftest.py                        | 21 +++++++++
 tests/daemon_test.py                     | 63 +++++++++++++-------------
 tests/direct_test.py                     | 11 +----
 tests/env.sh                             | 16 +++++++
 tests/{direct_test.py => python_test.py} | 16 ++-----
 tests/util.py                            | 77 ++++++++++++++++++++++++++++++++
 15 files changed, 170 insertions(+), 74 deletions(-)
 create mode 100644 .vimrc
 create mode 100644 tests/__init__.py
 create mode 100644 tests/conftest.py
 create mode 100644 tests/env.sh
 copy tests/{direct_test.py => python_test.py} (59%)
 create mode 100644 tests/util.py

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

[sanlock] 01/11: Add vim configuration

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

teigland pushed a commit to branch master
in repository sanlock.

commit 20b3d31b6a48818d9cb544d45602b834a31eba5a
Author: Nir Soffer <nsoffer(a)redhat.com&gt;
Date:   Fri Jan 12 21:29:27 2018 +0200

    Add vim configuration
    
    Vim users can use "set exrc" to adapt vim to sanlock code style
    automatically.
    
    Signed-off-by: Nir Soffer <nsoffer(a)redhat.com&gt;
---
 .vimrc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.vimrc b/.vimrc
new file mode 100644
index 0000000..b2f8328
--- /dev/null
+++ b/.vimrc
@@ -0,0 +1,4 @@
+" Local vim configuration for sanlock
+set noexpandtab
+set shiftwidth=8
+set tabstop=8

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

[sanlock] 02/11: Extract start_sanlock_deamon() helper

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

teigland pushed a commit to branch master
in repository sanlock.

commit 70bdc86128c01cbc7da77aa82c9e40188e257a2d
Author: Nir Soffer <nsoffer(a)redhat.com&gt;
Date:   Sat Jan 13 00:34:04 2018 +0200

    Extract start_sanlock_deamon() helper
    
    This will allow testing sanlock lockfile by trying to start multiple
    instances, and also makes the fixture code cleaner.
    
    Signed-off-by: Nir Soffer <nsoffer(a)redhat.com&gt;
---
 tests/daemon_test.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/daemon_test.py b/tests/daemon_test.py
index a3d299f..5c8c3c8 100644
--- a/tests/daemon_test.py
+++ b/tests/daemon_test.py
@@ -17,8 +17,7 @@ ENV["SANLOCK_RUN_DIR"] = "/tmp/sanlock"
 ENV["SANLOCK_PRIVILEGED"] = "0"
 
 
-(a)pytest.fixture(scope=&quot;session&quot;)
-def sanlock_daemon():
+def start_sanlock_daemon():
     cmd = [SANLOCK, "daemon",
            # no fork and print all logging to stderr
            "-D",
@@ -31,7 +30,12 @@ def sanlock_daemon():
            # run as current user instead of "sanlock"
            "-U", ENV["USER"],
            "-G", ENV["USER"]]
-    p = subprocess.Popen(cmd, env=ENV)
+    return subprocess.Popen(cmd, env=ENV)
+
+
+(a)pytest.fixture(scope=&quot;session&quot;)
+def sanlock_daemon():
+    p = start_sanlock_daemon()
     try:
         yield
     finally:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

[sanlock] 03/11: Start new daemon for every test

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

teigland pushed a commit to branch master
in repository sanlock.

commit ced9ae996cd55ed4e26ca9bf79bd92d2be2abfe3
Author: Nir Soffer <nsoffer(a)redhat.com&gt;
Date:   Sat Jan 13 00:34:05 2018 +0200

    Start new daemon for every test
    
    Change the sanlock_daemon fixture to run a new instance for every test.
    This is little slower but allows testing starting and killing the daemon.
    
    To make sure the daemon is ready before we test the client, wait until
    the daemon is listening on the socket before yielding to the test.
    
    Signed-off-by: Nir Soffer <nsoffer(a)redhat.com&gt;
---
 tests/daemon_test.py | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/tests/daemon_test.py b/tests/daemon_test.py
index 5c8c3c8..352a065 100644
--- a/tests/daemon_test.py
+++ b/tests/daemon_test.py
@@ -2,10 +2,13 @@
 Test sanlock client operations.
 """
 
+import errno
 import io
 import os
+import socket
 import struct
 import subprocess
+import time
 
 import pytest
 
@@ -17,6 +20,10 @@ ENV["SANLOCK_RUN_DIR"] = "/tmp/sanlock"
 ENV["SANLOCK_PRIVILEGED"] = "0"
 
 
+class TimeoutExpired(Exception):
+    """ Raised when timeout expired """
+
+
 def start_sanlock_daemon():
     cmd = [SANLOCK, "daemon",
            # no fork and print all logging to stderr
@@ -33,10 +40,31 @@ def start_sanlock_daemon():
     return subprocess.Popen(cmd, env=ENV)
 
 
-(a)pytest.fixture(scope=&quot;session&quot;)
+def wait_for_socket(timeout):
+    """ Wait until deamon is accepting connections """
+    deadline = time.time() + timeout
+    path = os.path.join(ENV["SANLOCK_RUN_DIR"], "sanlock.sock")
+    s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+    try:
+        while True:
+            try:
+                s.connect(path)
+                return
+            except socket.error as e:
+                if e[0] not in (errno.ECONNREFUSED, errno.ENOENT):
+                    raise  # Unexpected error
+            if time.time() > deadline:
+                raise TimeoutExpired
+            time.sleep(0.05)
+    finally:
+        s.close()
+
+
+(a)pytest.fixture
 def sanlock_daemon():
     p = start_sanlock_daemon()
     try:
+        wait_for_socket(0.5)
         yield
     finally:
         p.terminate()

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

[sanlock] 04/11: Add tests for sanlock lockfile

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

teigland pushed a commit to branch master
in repository sanlock.

commit 95873c9ac3c20445311320aec737934f90ab9192
Author: Nir Soffer <nsoffer(a)redhat.com&gt;
Date:   Sat Jan 13 00:34:06 2018 +0200

    Add tests for sanlock lockfile
    
    Add test for sanlock lockfile functionality:
    - Only one instance can be started
    - Being able to start the daemon after killing it
    
    Signed-off-by: Nir Soffer <nsoffer(a)redhat.com&gt;
---
 tests/daemon_test.py | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/tests/daemon_test.py b/tests/daemon_test.py
index 352a065..1c304ae 100644
--- a/tests/daemon_test.py
+++ b/tests/daemon_test.py
@@ -5,6 +5,7 @@ Test sanlock client operations.
 import errno
 import io
 import os
+import signal
 import socket
 import struct
 import subprocess
@@ -60,6 +61,19 @@ def wait_for_socket(timeout):
         s.close()
 
 
+def wait_for_termination(p, timeout):
+    """
+    Wait until process terminates, or timeout expires.
+    """
+    deadline = time.time() + timeout
+    while True:
+        if p.poll() is not None:
+            return
+        if time.time() > deadline:
+            raise TimeoutExpired
+        time.sleep(0.05)
+
+
 @pytest.fixture
 def sanlock_daemon():
     p = start_sanlock_daemon()
@@ -71,6 +85,29 @@ def sanlock_daemon():
         p.wait()
 
 
+def test_single_instance(sanlock_daemon):
+    # Starting another instance while the daemon must fail.
+    p = start_sanlock_daemon()
+    try:
+        wait_for_termination(p, 1.0)
+    except TimeoutExpired:
+        p.kill()
+        p.wait()
+    assert p.returncode == 255  # exit code -1
+
+
+def test_start_after_kill():
+    # After killing the daemon, next instance should be able to start.
+    for i in range(5):
+        p = start_sanlock_daemon()
+        try:
+            wait_for_socket(0.5)
+        finally:
+            p.kill()
+            p.wait()
+        assert p.returncode == -signal.SIGKILL
+
+
 def test_init_lockspace(tmpdir, sanlock_daemon):
     path = tmpdir.join("lockspace")
     with io.open(str(path), "wb") as f:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

[sanlock] 05/11: Do not unlink sanlock lockfile on shutdown

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

teigland pushed a commit to branch master
in repository sanlock.

commit 97358a624bae7544cb7760c070ec1cc17b9c2f9e
Author: Nir Soffer <nsoffer(a)redhat.com&gt;
Date:   Sat Jan 13 00:34:07 2018 +0200

    Do not unlink sanlock lockfile on shutdown
    
    Unlinking a lockfile is racy; another instance may have the same
    lockfile open, waiting on the lock.
    
    This is a possible failure mode:
    
    1. Process 1 holds the lock.
    2. Process 2 opens the lockfile and tries to acquire the lockfile.
    3. Process 1 unlinks the lockfile and releases it.
    4. Process 2 acquires the unlinked lockfile.
    5. Process 3 creates a new lockfile acquires it.
    
    So we may end with 2 processes, both thinking they are the only instance
    running.
    
    This issue may be fixed by checking the lockfile inode before and after
    locking to detect deleted lockfile. But there is a simpler solution;
    since we have exactly one lockfile, don't delete it.
    
    Signed-off-by: Nir Soffer <nsoffer(a)redhat.com&gt;
---
 src/lockfile.c | 10 ----------
 src/lockfile.h |  1 -
 src/main.c     |  2 +-
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/lockfile.c b/src/lockfile.c
index 1839f56..5a2518e 100644
--- a/src/lockfile.c
+++ b/src/lockfile.c
@@ -101,13 +101,3 @@ int lockfile(const char *dir, const char *name, int uid, int gid)
 	close(fd);
 	return -1;
 }
-
-void unlink_lockfile(int fd, const char *dir, const char *name)
-{
-	char path[PATH_MAX];
-
-	snprintf(path, PATH_MAX, "%s/%s", dir, name);
-	unlink(path);
-	close(fd);
-}
-
diff --git a/src/lockfile.h b/src/lockfile.h
index 57bbcec..b6835d5 100644
--- a/src/lockfile.h
+++ b/src/lockfile.h
@@ -10,6 +10,5 @@
 #define	__LOCKFILE_H__
 
 int lockfile(const char *dir, const char *name, int uid, int gid);
-void unlink_lockfile(int fd, const char *dir, const char *name);
 
 #endif
diff --git a/src/main.c b/src/main.c
index 5be949b..1f879b0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1721,7 +1721,7 @@ static int do_daemon(void)
  out:
 	/* order reversed from setup so lockfile is last */
 	close_logging();
-	unlink_lockfile(fd, run_dir, SANLK_LOCKFILE_NAME);
+	close(fd);
 	return rv;
 }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

[sanlock] 06/11: Normalize sanlock exit code

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

teigland pushed a commit to branch master
in repository sanlock.

commit c46aa2e809ffdd92a84407dff30e76072deff83a
Author: Nir Soffer <nsoffer(a)redhat.com&gt;
Date:   Sat Jan 13 00:34:08 2018 +0200

    Normalize sanlock exit code
    
    Normalize sanlock exit code, so it exit with EXIT_FAILURE on all
    failures.
    
    Previously sanlock terminated with exit code 255 if lockfile() failed,
    145 if client cannot connect to the daemon, or any other number
    depending on return value of failing function.
    
    Exit codes above 128 should be returned only when the process was
    terminated by signal (typically 128 + signo), and using them for other
    errors may confuse applications managing sanlock.
    
    Since sanlock exit code is not documented, this change should not break
    any user code.
    
    Signed-off-by: Nir Soffer <nsoffer(a)redhat.com&gt;
---
 src/main.c           | 2 +-
 tests/daemon_test.py | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main.c b/src/main.c
index 1f879b0..9340ef7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3314,6 +3314,6 @@ int main(int argc, char *argv[])
 		break;
 	};
  out:
-	return rv;
+	return rv == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
diff --git a/tests/daemon_test.py b/tests/daemon_test.py
index 1c304ae..af1e890 100644
--- a/tests/daemon_test.py
+++ b/tests/daemon_test.py
@@ -93,7 +93,7 @@ def test_single_instance(sanlock_daemon):
     except TimeoutExpired:
         p.kill()
         p.wait()
-    assert p.returncode == 255  # exit code -1
+    assert p.returncode == 1
 
 
 def test_start_after_kill():
@@ -108,6 +108,13 @@ def test_start_after_kill():
         assert p.returncode == -signal.SIGKILL
 
 
+def test_client_failure():
+    # No daemon is running, client must fail
+    with pytest.raises(subprocess.CalledProcessError) as e:
+        run(SANLOCK, "client", "status")
+    assert e.value.returncode == 1
+
+
 def test_init_lockspace(tmpdir, sanlock_daemon):
     path = tmpdir.join("lockspace")
     with io.open(str(path), "wb") as f:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

[sanlock] 07/11: Introduce tests.util module

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

teigland pushed a commit to branch master
in repository sanlock.

commit fc4f19091aa346b694370503d05c0e247fba055b
Author: Nir Soffer <nsoffer(a)redhat.com&gt;
Date:   Mon Jan 15 01:21:48 2018 +0200

    Introduce tests.util module
    
    All the helper functions and constants moved to new util module.
    
    This module provides:
    
    - util.start_daemon() - starts a sanlock daemon process.
    
    - util.wait_for_daemon() - wait until sanlock daemon is ready.
    
    - util.sanlock() - run sanlock and return the output. Useful for running
      "sanlock client ..." or "sanlock direct ..." commands.
    
    - util.wait_for_termination - wait until a process terminates within a
      timeout.
    
    Signed-off-by: Nir Soffer <nsoffer(a)redhat.com&gt;
---
 tests/__init__.py    |  0
 tests/daemon_test.py | 89 ++++++++--------------------------------------------
 tests/direct_test.py | 11 ++-----
 tests/util.py        | 81 +++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 96 insertions(+), 85 deletions(-)

diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/daemon_test.py b/tests/daemon_test.py
index af1e890..d84b838 100644
--- a/tests/daemon_test.py
+++ b/tests/daemon_test.py
@@ -2,83 +2,24 @@
 Test sanlock client operations.
 """
 
-import errno
 import io
-import os
 import signal
-import socket
 import struct
 import subprocess
-import time
 
 import pytest
 
-tests_dir = os.path.dirname(__file__)
-SANLOCK = os.path.join(tests_dir, os.pardir, "src", "sanlock")
-
-ENV = dict(os.environ)
-ENV["SANLOCK_RUN_DIR"] = "/tmp/sanlock"
-ENV["SANLOCK_PRIVILEGED"] = "0"
-
-
-class TimeoutExpired(Exception):
-    """ Raised when timeout expired """
-
-
-def start_sanlock_daemon():
-    cmd = [SANLOCK, "daemon",
-           # no fork and print all logging to stderr
-           "-D",
-           # don't use watchdog through wdmd
-           "-w", "0",
-           # don't use mlockall
-           "-l", "0",
-           # don't use high priority (RR) scheduling
-           "-h", "0",
-           # run as current user instead of "sanlock"
-           "-U", ENV["USER"],
-           "-G", ENV["USER"]]
-    return subprocess.Popen(cmd, env=ENV)
-
-
-def wait_for_socket(timeout):
-    """ Wait until deamon is accepting connections """
-    deadline = time.time() + timeout
-    path = os.path.join(ENV["SANLOCK_RUN_DIR"], "sanlock.sock")
-    s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-    try:
-        while True:
-            try:
-                s.connect(path)
-                return
-            except socket.error as e:
-                if e[0] not in (errno.ECONNREFUSED, errno.ENOENT):
-                    raise  # Unexpected error
-            if time.time() > deadline:
-                raise TimeoutExpired
-            time.sleep(0.05)
-    finally:
-        s.close()
-
-
-def wait_for_termination(p, timeout):
-    """
-    Wait until process terminates, or timeout expires.
-    """
-    deadline = time.time() + timeout
-    while True:
-        if p.poll() is not None:
-            return
-        if time.time() > deadline:
-            raise TimeoutExpired
-        time.sleep(0.05)
+from . import util
 
 
 @pytest.fixture
 def sanlock_daemon():
-    p = start_sanlock_daemon()
+    """
+    Run sanlock daemon during a test.
+    """
+    p = util.start_daemon()
     try:
-        wait_for_socket(0.5)
+        util.wait_for_daemon(0.5)
         yield
     finally:
         p.terminate()
@@ -87,10 +28,10 @@ def sanlock_daemon():
 
 def test_single_instance(sanlock_daemon):
     # Starting another instance while the daemon must fail.
-    p = start_sanlock_daemon()
+    p = util.start_daemon()
     try:
-        wait_for_termination(p, 1.0)
-    except TimeoutExpired:
+        util.wait_for_termination(p, 1.0)
+    except util.TimeoutExpired:
         p.kill()
         p.wait()
     assert p.returncode == 1
@@ -99,9 +40,9 @@ def test_single_instance(sanlock_daemon):
 def test_start_after_kill():
     # After killing the daemon, next instance should be able to start.
     for i in range(5):
-        p = start_sanlock_daemon()
+        p = util.start_daemon()
         try:
-            wait_for_socket(0.5)
+            util.wait_for_daemon(0.5)
         finally:
             p.kill()
             p.wait()
@@ -111,7 +52,7 @@ def test_start_after_kill():
 def test_client_failure():
     # No daemon is running, client must fail
     with pytest.raises(subprocess.CalledProcessError) as e:
-        run(SANLOCK, "client", "status")
+        util.sanlock("client", "status")
     assert e.value.returncode == 1
 
 
@@ -122,7 +63,7 @@ def test_init_lockspace(tmpdir, sanlock_daemon):
         f.write(b"x" * 1024**2 + b"X" * 512)
 
     lockspace = "name:1:%s:0" % path
-    run(SANLOCK, "client", "init", "-s", lockspace)
+    util.sanlock("client", "init", "-s", lockspace)
 
     with io.open(str(path), "rb") as f:
         magic, = struct.unpack("< I", f.read(4))
@@ -133,7 +74,3 @@ def test_init_lockspace(tmpdir, sanlock_daemon):
         # Do not modify data after the lockspace area.
         f.seek(1024**2, io.SEEK_SET)
         assert f.read(512) == b"X" * 512
-
-
-def run(*args):
-    return subprocess.check_output(args, env=ENV)
diff --git a/tests/direct_test.py b/tests/direct_test.py
index 3536f5e..fa7c572 100644
--- a/tests/direct_test.py
+++ b/tests/direct_test.py
@@ -3,12 +3,9 @@ Test sanlock direct options.
 """
 
 import io
-import os
 import struct
-import subprocess
 
-tests_dir = os.path.dirname(__file__)
-SANLOCK = os.path.join(tests_dir, os.pardir, "src", "sanlock")
+from . import util
 
 
 def test_init_lockspace(tmpdir):
@@ -18,7 +15,7 @@ def test_init_lockspace(tmpdir):
         f.write(b"x" * 1024**2 + b"X" * 512)
 
     lockspace = "name:1:%s:0" % path
-    run(SANLOCK, "direct", "init", "-s", lockspace)
+    util.sanlock("direct", "init", "-s", lockspace)
 
     with io.open(str(path), "rb") as f:
         magic, = struct.unpack("< I", f.read(4))
@@ -29,7 +26,3 @@ def test_init_lockspace(tmpdir):
         # Do not modify data after the lockspace area.
         f.seek(1024**2, io.SEEK_SET)
         assert f.read(512) == b"X" * 512
-
-
-def run(*args):
-    return subprocess.check_output(args)
diff --git a/tests/util.py b/tests/util.py
new file mode 100644
index 0000000..002425b
--- /dev/null
+++ b/tests/util.py
@@ -0,0 +1,81 @@
+"""
+Testing utilities
+"""
+
+import errno
+import os
+import socket
+import subprocess
+import time
+
+TESTDIR = os.path.dirname(__file__)
+SANLOCK = os.path.join(TESTDIR, os.pardir, "src", "sanlock")
+
+ENV = dict(os.environ)
+ENV["SANLOCK_RUN_DIR"] = "/tmp/sanlock"
+ENV["SANLOCK_PRIVILEGED"] = "0"
+
+
+class TimeoutExpired(Exception):
+    """ Raised when timeout expired """
+
+
+def start_daemon():
+    cmd = [SANLOCK, "daemon",
+           # no fork and print all logging to stderr
+           "-D",
+           # don't use watchdog through wdmd
+           "-w", "0",
+           # don't use mlockall
+           "-l", "0",
+           # don't use high priority (RR) scheduling
+           "-h", "0",
+           # run as current user instead of "sanlock"
+           "-U", ENV["USER"],
+           "-G", ENV["USER"]]
+    return subprocess.Popen(cmd, env=ENV)
+
+
+def wait_for_daemon(timeout):
+    """
+    Wait until deamon is accepting connections
+    """
+    deadline = time.time() + timeout
+    path = os.path.join(ENV["SANLOCK_RUN_DIR"], "sanlock.sock")
+    s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+    try:
+        while True:
+            try:
+                s.connect(path)
+                return
+            except socket.error as e:
+                if e[0] not in (errno.ECONNREFUSED, errno.ENOENT):
+                    raise  # Unexpected error
+            if time.time() > deadline:
+                raise TimeoutExpired
+            time.sleep(0.05)
+    finally:
+        s.close()
+
+
+def sanlock(*args):
+    """
+    Run sanlock returning the process stdout, or raising
+    subprocess.CalledProcessError on failures.
+    """
+    cmd = [SANLOCK]
+    cmd.extend(args)
+    return subprocess.check_output(cmd, env=ENV)
+
+
+def wait_for_termination(p, timeout):
+    """
+    Wait until process terminates, or timeout expires.
+    """
+    deadline = time.time() + timeout
+    while True:
+        if p.poll() is not None:
+            return
+        if time.time() > deadline:
+            raise TimeoutExpired
+        time.sleep(0.05)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

[sanlock] 08/11: Introduce conftest module

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

teigland pushed a commit to branch master
in repository sanlock.

commit 95093da80bba95551da0e1f9fd2492786ccd42d4
Author: Nir Soffer <nsoffer(a)redhat.com&gt;
Date:   Mon Jan 15 01:21:49 2018 +0200

    Introduce conftest module
    
    Move the fixtures to conftest module. pytest discover these fixture and
    make them available for all tests modules.
    
    Signed-off-by: Nir Soffer <nsoffer(a)redhat.com&gt;
---
 tests/conftest.py    | 21 +++++++++++++++++++++
 tests/daemon_test.py | 14 --------------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
new file mode 100644
index 0000000..8055c88
--- /dev/null
+++ b/tests/conftest.py
@@ -0,0 +1,21 @@
+"""
+Fixtures for sanlock testing.
+"""
+
+import pytest
+
+from . import util
+
+
+(a)pytest.fixture
+def sanlock_daemon():
+    """
+    Run sanlock daemon during a test.
+    """
+    p = util.start_daemon()
+    try:
+        util.wait_for_daemon(0.5)
+        yield
+    finally:
+        p.terminate()
+        p.wait()
diff --git a/tests/daemon_test.py b/tests/daemon_test.py
index d84b838..1e94563 100644
--- a/tests/daemon_test.py
+++ b/tests/daemon_test.py
@@ -12,20 +12,6 @@ import pytest
 from . import util
 
 
-(a)pytest.fixture
-def sanlock_daemon():
-    """
-    Run sanlock daemon during a test.
-    """
-    p = util.start_daemon()
-    try:
-        util.wait_for_daemon(0.5)
-        yield
-    finally:
-        p.terminate()
-        p.wait()
-
-
 def test_single_instance(sanlock_daemon):
     # Starting another instance while the daemon must fail.
     p = util.start_daemon()

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

[sanlock] 09/11: Move environment setup to a shell script

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

teigland pushed a commit to branch master
in repository sanlock.

commit 6be1f4f59824b1f356863807c7c9f22a46579a0e
Author: Nir Soffer <nsoffer(a)redhat.com&gt;
Date:   Mon Jan 15 01:21:50 2018 +0200

    Move environment setup to a shell script
    
    The environment variables are required both the sanlock executable
    running from the tests, and for the testing modules. For example,
    sanlock python binding will look for sanlock socket using
    SANLOCK_RUN_DIR.
    
    Signed-off-by: Nir Soffer <nsoffer(a)redhat.com&gt;
---
 .travis.yml   |  4 +---
 README.dev    |  5 +++--
 tests/env.sh  | 16 ++++++++++++++++
 tests/util.py | 14 +++++---------
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 883840b..56261cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,10 +4,8 @@ before_install:
     - sudo apt-get -qq update
     - sudo apt-get install -y make gcc libaio-dev libblkid-dev
 
-env:
-    - LD_LIBRARY_PATH=$PWD/src:$PWD/wdmd
-
 script:
     - make -C wdmd
     - make -C src
+    - source tests/env.sh
     - pytest
diff --git a/README.dev b/README.dev
index 52bc828..0ffae81 100644
--- a/README.dev
+++ b/README.dev
@@ -11,9 +11,10 @@ Before running the tests, you need to build sanlock and wdmd:
     $ make -C wdmd
     $ make -C src
 
-To use libsanlock.so and libwdmd.so from the source tree:
+Setup the environment for testing sanlock running sanlcok from source as
+current user:
 
-    $ export LD_LIBRARY_PATH=$PWD/src:$PWD/wdmd
+    $ source tests/env.sh
 
 To run the tests:
 
diff --git a/tests/env.sh b/tests/env.sh
new file mode 100644
index 0000000..39a3dd2
--- /dev/null
+++ b/tests/env.sh
@@ -0,0 +1,16 @@
+# Setup the environment for testing sanlock.
+
+# Use built libraries from source
+export LD_LIBRARY_PATH=$PWD/wdmd:$PWD/src
+
+# Disable privileged operations, allowing to run sanlock daemon as
+# non-privileged user.
+export SANLOCK_PRIVILEGED=0
+
+# Use temporary sanlock run dir, usable for non-privileged user.  This
+# is used by sanlock daemon to create a lockfile and socket, and by
+# sanlock clients for communicating with the daemon.
+export SANLOCK_RUN_DIR=/tmp/sanlock
+
+# Import sanlock extension module from source.
+export PYTHONPATH=$PWD/python
diff --git a/tests/util.py b/tests/util.py
index 002425b..157624a 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -11,10 +11,6 @@ import time
 TESTDIR = os.path.dirname(__file__)
 SANLOCK = os.path.join(TESTDIR, os.pardir, "src", "sanlock")
 
-ENV = dict(os.environ)
-ENV["SANLOCK_RUN_DIR"] = "/tmp/sanlock"
-ENV["SANLOCK_PRIVILEGED"] = "0"
-
 
 class TimeoutExpired(Exception):
     """ Raised when timeout expired """
@@ -31,9 +27,9 @@ def start_daemon():
            # don't use high priority (RR) scheduling
            "-h", "0",
            # run as current user instead of "sanlock"
-           "-U", ENV["USER"],
-           "-G", ENV["USER"]]
-    return subprocess.Popen(cmd, env=ENV)
+           "-U", os.environ["USER"],
+           "-G", os.environ["USER"]]
+    return subprocess.Popen(cmd)
 
 
 def wait_for_daemon(timeout):
@@ -41,7 +37,7 @@ def wait_for_daemon(timeout):
     Wait until deamon is accepting connections
     """
     deadline = time.time() + timeout
-    path = os.path.join(ENV["SANLOCK_RUN_DIR"], "sanlock.sock")
+    path = os.path.join(os.environ["SANLOCK_RUN_DIR"],
"sanlock.sock")
     s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
     try:
         while True:
@@ -65,7 +61,7 @@ def sanlock(*args):
     """
     cmd = [SANLOCK]
     cmd.extend(args)
-    return subprocess.check_output(cmd, env=ENV)
+    return subprocess.check_output(cmd)
 
 
 def wait_for_termination(p, timeout):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

[sanlock] 10/11: Fix libsanlock build on Unubtu/Debian

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

teigland pushed a commit to branch master
in repository sanlock.

commit c7fd1b6915c470c6beb191a79c741fb1e6ca9575
Author: Nir Soffer <nsoffer(a)redhat.com&gt;
Date:   Mon Jan 15 01:21:51 2018 +0200

    Fix libsanlock build on Unubtu/Debian
    
    LIB_ENTIRE_LDFLAGS included libraries (e.g. -laio -lblkid) instead of
    linker flags. The libraries should be in LIB_ENTIRE_LDDADD and come
    *after* the sources. Otherwisae, the libraries are not linked, and
    loading libsanlock.so fail with undefined symbol error.
    
    Signed-off-by: Nir Soffer <nsoffer(a)redhat.com&gt;
---
 src/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 3ca25c9..9e914d9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -101,15 +101,15 @@ CMD_CFLAGS = $(CFLAGS) -fPIE -DPIE
 CMD_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie
 CMD_LDADD += -lpthread -luuid -lrt -laio -lblkid -lsanlock -L../wdmd -lwdmd
 
-LIB_ENTIRE_LDFLAGS += -lpthread -lrt -laio -lblkid -L../wdmd -lwdmd
 LIB_ENTIRE_LDFLAGS += -Wl,-z,relro -pie
+LIB_ENTIRE_LDADD += -lpthread -lrt -laio -lblkid -L../wdmd -lwdmd
 
 LIB_CLIENT_LDFLAGS += -Wl,-z,relro -pie
 
 all: $(LIBSO_ENTIRE_TARGET) $(LIBSO_CLIENT_TARGET) $(CMD_TARGET) $(LIBPC_ENTIRE_TARGET)
$(LIBPC_CLIENT_TARGET)
 
 $(LIBSO_ENTIRE_TARGET): $(LIB_ENTIRE_SOURCE)
-	$(CC) $(CFLAGS) $(LIB_ENTIRE_LDFLAGS) -shared -fPIC -o $@
-Wl,-soname=$(LIB_ENTIRE_TARGET).so.$(SOMAJOR) $^
+	$(CC) $(CFLAGS) $(LIB_ENTIRE_LDFLAGS) -shared -fPIC -o $@
-Wl,-soname=$(LIB_ENTIRE_TARGET).so.$(SOMAJOR) $^ $(LIB_ENTIRE_LDADD)
 	ln -sf $(LIBSO_ENTIRE_TARGET) $(LIB_ENTIRE_TARGET).so
 	ln -sf $(LIBSO_ENTIRE_TARGET) $(LIB_ENTIRE_TARGET).so.$(SOMAJOR)
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

[sanlock] 11/11: Start python binding test module

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

teigland pushed a commit to branch master
in repository sanlock.

commit 19a07f6868e22b7026d3dd07638bb33ad898495e
Author: Nir Soffer <nsoffer(a)redhat.com&gt;
Date:   Mon Jan 15 01:21:52 2018 +0200

    Start python binding test module
    
    This module allows testing sanlock daemon via the sanlock python
    bindings.
    
    Signed-off-by: Nir Soffer <nsoffer(a)redhat.com&gt;
---
 .travis.yml          |  1 +
 README.dev           |  4 +++-
 python/Makefile      |  3 +++
 tests/python_test.py | 27 +++++++++++++++++++++++++++
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 56261cd..9668e82 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,5 +7,6 @@ before_install:
 script:
     - make -C wdmd
     - make -C src
+    - make -C python inplace
     - source tests/env.sh
     - pytest
diff --git a/README.dev b/README.dev
index 0ffae81..04fbb02 100644
--- a/README.dev
+++ b/README.dev
@@ -6,10 +6,12 @@ recent version is to use pip:
 
     $ pip install pytest
 
-Before running the tests, you need to build sanlock and wdmd:
+Before running the tests, you need to build wdmd, sanlock, and sanlock
+python bindings:
 
     $ make -C wdmd
     $ make -C src
+    $ make -C python inplace
 
 Setup the environment for testing sanlock running sanlcok from source as
 current user:
diff --git a/python/Makefile b/python/Makefile
index 92b0c28..ff24e1d 100644
--- a/python/Makefile
+++ b/python/Makefile
@@ -7,6 +7,9 @@
 all:
 	python setup.py build
 
+inplace:
+	python setup.py build_ext --inplace
+
 install:
 	python setup.py install --root=$(DESTDIR)
 
diff --git a/tests/python_test.py b/tests/python_test.py
new file mode 100644
index 0000000..e455e11
--- /dev/null
+++ b/tests/python_test.py
@@ -0,0 +1,27 @@
+"""
+Test sanlock python binding with sanlock daemon.
+"""
+
+import io
+import struct
+
+import sanlock
+
+
+def test_write_lockspace(tmpdir, sanlock_daemon):
+    path = tmpdir.join("lockspace")
+    with io.open(str(path), "wb") as f:
+        # Poison with junk data.
+        f.write(b"x" * 1024**2 + b"X" * 512)
+
+    sanlock.write_lockspace("name", str(path), offset=0)
+
+    with io.open(str(path), "rb") as f:
+        magic, = struct.unpack("< I", f.read(4))
+        assert magic == 0x12212010
+
+        # TODO: check more stuff here...
+
+        # Do not modify data after the lockspace area.
+        f.seek(1024**2, io.SEEK_SET)
+        assert f.read(512) == b"X" * 512

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.