File: Tests-Fix-race-condition-during-GNUPGHOME-cleanup.patch

package info (click to toggle)
php-crypt-gpg 1.6.11-1
  • links: PTS, VCS
  • area: main
  • in suites: sid, trixie
  • size: 1,352 kB
  • sloc: php: 9,155; xml: 191; makefile: 8
file content (64 lines) | stat: -rw-r--r-- 2,077 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
From: Guilhem Moulin <guilhem@debian.org>
Date: Tue, 3 Sep 2024 13:28:24 +0200
Subject: Test suite: Fix race condition during $GNUPGHOME cleanup.

gpg tries to remove sockets hence races against tearDown().  We
therefore ignore unlink()/rmdir() errors.

Bug-Debian: https://bugs.debian.org/1080394
---
 Crypt_GPG-1.6.11/tests/TestCase.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Crypt_GPG-1.6.11/tests/TestCase.php b/Crypt_GPG-1.6.11/tests/TestCase.php
index c48d328..c43e98e 100644
--- a/Crypt_GPG-1.6.11/tests/TestCase.php
+++ b/Crypt_GPG-1.6.11/tests/TestCase.php
@@ -569,11 +569,11 @@ TEXT;
                     if (!$file->isDot()) {
                         $filename = $dirname . '/' . $file->getFilename();
                         if (file_exists($filename)) {
-                            unlink($filename);
+                            @unlink($filename);
                         }
                     }
                 }
-                rmdir($dirname);
+                @rmdir($dirname);
             }
         }
 
@@ -584,12 +584,12 @@ TEXT;
             if (!$file->isDot()) {
                 $filename = $homedir . '/' . $file->getFilename();
                 if (file_exists($filename)) {
-                    unlink($filename);
+                    @unlink($filename);
                 }
             }
         }
 
-        rmdir($homedir);
+        @rmdir($homedir);
     }
 
     private function _tearDownTempdir()
@@ -603,15 +603,15 @@ TEXT;
                 $filename = $this->getTempFilename($file->getFilename());
                 if (file_exists($filename)) {
                     if (is_dir($filename)) {
-                        rmdir($filename);
+                        @rmdir($filename);
                     } else {
-                        unlink($filename);
+                        @unlink($filename);
                     }
                 }
             }
         }
 
-        rmdir($directoryName);
+        @rmdir($directoryName);
     }
 
     protected function getMd5Sum($filename)