15
0

Accepting request 799146 from devel:languages:python

- Add patch to fix test running without python2:
  * no-python2.patch

OBS-URL: https://build.opensuse.org/request/show/799146
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-daemonize?expand=0&rev=5
This commit is contained in:
2020-05-01 09:13:10 +00:00
committed by Git OBS Bridge
3 changed files with 93 additions and 2 deletions

84
no-python2.patch Normal file
View File

@@ -0,0 +1,84 @@
Index: daemonize-2.5.0/tests/test.py
===================================================================
--- daemonize-2.5.0.orig/tests/test.py
+++ daemonize-2.5.0/tests/test.py
@@ -3,6 +3,7 @@ import os
import pwd
import grp
import subprocess
+import sys
from tempfile import mkstemp
from time import sleep
@@ -18,7 +19,7 @@ else:
class DaemonizeTest(unittest.TestCase):
def setUp(self):
self.pidfile = mkstemp()[1]
- os.system("python tests/daemon_sigterm.py %s" % self.pidfile)
+ os.system("%s tests/daemon_sigterm.py %s" % (sys.executable, self.pidfile))
sleep(.1)
def tearDown(self):
@@ -43,7 +44,7 @@ class LockingTest(unittest.TestCase):
def setUp(self):
self.pidfile = mkstemp()[1]
print("First daemonize process started")
- os.system("python tests/daemon_sigterm.py %s" % self.pidfile)
+ os.system("%s tests/daemon_sigterm.py %s" % (sys.executable, self.pidfile))
sleep(.1)
def tearDown(self):
@@ -53,7 +54,7 @@ class LockingTest(unittest.TestCase):
def test_locking(self):
sleep(10)
print("Attempting to start second daemonize process")
- proc = subprocess.call(["python", "tests/daemon_sigterm.py", self.pidfile])
+ proc = subprocess.call([sys.executable, "tests/daemon_sigterm.py", self.pidfile])
self.assertEqual(proc, 1)
@@ -61,7 +62,7 @@ class KeepFDsTest(unittest.TestCase):
def setUp(self):
self.pidfile = mkstemp()[1]
self.logfile = mkstemp()[1]
- os.system("python tests/daemon_keep_fds.py %s %s" % (self.pidfile, self.logfile))
+ os.system("%s tests/daemon_keep_fds.py %s %s" % (sys.executable, self.pidfile, self.logfile))
sleep(1)
def tearDown(self):
@@ -90,7 +91,7 @@ class UidGidTest(unittest.TestCase):
os.chown(self.logfile, NOBODY_UID, NOBODY_GID)
- os.system("python tests/daemon_uid_gid.py %s %s" % (self.pidfile, self.logfile))
+ os.system("%s tests/daemon_uid_gid.py %s %s" % (sys.executable, self.pidfile, self.logfile))
sleep(1)
with open(self.logfile, "r") as f:
@@ -104,7 +105,7 @@ class UidGidTest(unittest.TestCase):
os.chown(self.pidfile, NOBODY_UID, NOBODY_GID)
- os.system("python tests/daemon_uid_gid_action.py %s %s" % (self.pidfile, self.logfile))
+ os.system("%s tests/daemon_uid_gid_action.py %s %s" % (sys.executable, self.pidfile, self.logfile))
sleep(1)
with open(self.logfile, "r") as f:
@@ -120,7 +121,7 @@ Stopping daemon.
"""
self.pidfile = mkstemp()[1]
self.logfile = mkstemp()[1]
- os.system("python tests/daemon_privileged_action.py %s %s" % (self.pidfile, self.logfile))
+ os.system("%s tests/daemon_privileged_action.py %s %s" % (sys.executable, self.pidfile, self.logfile))
sleep(.1)
def tearDown(self):
@@ -139,7 +140,7 @@ class ChdirTest(unittest.TestCase):
self.target = mkstemp()[1]
base, file = split(self.target)
- os.system("python tests/daemon_chdir.py %s %s %s" % (self.pidfile, base, file))
+ os.system("%s tests/daemon_chdir.py %s %s %s" % (sys.executable, self.pidfile, base, file))
sleep(1)
def tearDown(self):

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Apr 30 07:54:44 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- Add patch to fix test running without python2:
* no-python2.patch
-------------------------------------------------------------------
Thu Mar 7 14:00:13 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>

View File

@@ -1,7 +1,7 @@
#
# spec file for package python-daemonize
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,9 +22,9 @@ Version: 2.5.0
Release: 0
Summary: Python module to launch code as a daemon process
License: MIT
Group: Development/Languages/Python
URL: https://github.com/thesharp/daemonize
Source: https://github.com/thesharp/daemonize/archive/v%{version}.tar.gz
Patch0: no-python2.patch
BuildRequires: %{python_module nose}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@@ -39,6 +39,7 @@ daemonize is a library for writing system daemons in Python.
%prep
%setup -q -n daemonize-%{version}
%patch0 -p1
%build
%python_build