rpms/javapackages-tools
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Don't try to kill PID 1 during tests

Browse Source
This commit is contained in:
Mikolaj Izdebski 2020-05-18 09:12:56 +02:00
parent 813ab6d574
commit 61641e7bd6
6 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-Move-python-modules-under-java-utils-directory.patch
View File

@ -1,7 +1,7 @@
From 760c3e7a568295ded8229b06e651915c78475ccd Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 26 Apr 2019 00:50:00 +0200
Subject: [PATCH 1/4] Move python modules under java-utils directory
Subject: [PATCH 1/5] Move python modules under java-utils directory
---
depgenerators/javadoc.req | 3 +++

2
0002-Enable-namespaced-dependency-generation.patch
View File

@ -1,7 +1,7 @@
From 48f5467fea8006cf0fe091d28fd879e6aed5a4b1 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 28 Jun 2019 14:53:26 +0200
Subject: [PATCH 2/4] Enable namespaced dependency generation
Subject: [PATCH 2/5] Enable namespaced dependency generation
---
depgenerators/fileattrs/javadoc.attr | 2 +-

2
0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch
View File

@ -1,7 +1,7 @@
From 0b0f93a4bc050a67e6885a647270a716f3d9cdce Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 2 Sep 2019 18:10:01 +0200
Subject: [PATCH 3/4] Fix use of illegal characters in rpmfc generator names
Subject: [PATCH 3/5] Fix use of illegal characters in rpmfc generator names
---
configure-base.sh | 2 +-

2
0004-Skip-execution-of-various-Maven-plugins.patch
View File

@ -1,7 +1,7 @@
From 4e9d0cd44cc47e88f48f160e5b2fd74d944147e5 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sat, 29 Jun 2019 12:09:25 +0200
Subject: [PATCH 4/4] Skip execution of various Maven plugins
Subject: [PATCH 4/5] Skip execution of various Maven plugins
Resolves: #70
---

29
0005-test-Don-t-try-to-kill-PID-1-during-tests.patch Normal file
View File

@ -0,0 +1,29 @@
From 16808487796822c5477d1ba0478bd2b0ca884818 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 18 May 2020 09:11:31 +0200
Subject: [PATCH 5/5] [test] Don't try to kill PID 1 during tests
Normally PID 1 should not be killable, but when running tests in
container this is actually possible.
---
test/test_common.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/test_common.py b/test/test_common.py
index 9bdc4675..67370422 100644
--- a/test/test_common.py
+++ b/test/test_common.py
@@ -163,8 +163,8 @@ def call_rpmgen(rpmgen_name, filelist_prefix, filelist, env=None,
except OSError:
pass
for line in stdin:
- # FIXME this PID is a temporary hack
- ret = call_script(scriptpath, ["--cachedir", "/tmp", "--rpm-pid", "1"],
+ _, dummy_pid, _ = util.execute_command("echo $$")
+ ret = call_script(scriptpath, ["--cachedir", "/tmp", "--rpm-pid", dummy_pid],
stdin=line, extra_env=env)
try:
shutil.rmtree("/tmp/.javapackages_cache/")
--
2.25.4

2
javapackages-tools.spec
View File

@ -38,6 +38,7 @@ Patch1: 0001-Move-python-modules-under-java-utils-directory.patch
Patch2: 0002-Enable-namespaced-dependency-generation.patch
Patch3: 0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch
Patch4: 0004-Skip-execution-of-various-Maven-plugins.patch
Patch5: 0005-test-Don-t-try-to-kill-PID-1-during-tests.patch
BuildRequires: coreutils
BuildRequires: which
@ -142,6 +143,7 @@ OpenJDK 8 toolchain for XMvn
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
sed -i '/^manpage /d' build
sed -i '/${mandir}/d' install