code.ossystems Code Review - openembedded-core.git/blob

   1 From b1a5c92dbd1d11f1afdc094fccea64de334d2783 Mon Sep 17 00:00:00 2001
   2 From: Alexander Kanavin <alex.kanavin@gmail.com>
   3 Date: Fri, 30 Dec 2016 18:06:24 +0200
   4 Subject: [PATCH 3/4] tests: fix a race when deleting temporary directories
   5
   6 Upstream-Status: Pending
   7 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
   8 ---
   9  tests/python/tests/test_yum_repo_downloading.py | 2 +-
  10  tests/python/tests/test_yum_repo_locating.py    | 2 +-
  11  2 files changed, 2 insertions(+), 2 deletions(-)
  12
  13 diff --git a/tests/python/tests/test_yum_repo_downloading.py b/tests/python/tests/test_yum_repo_downloading.py
  14 index ad597dc..4a32519 100644
  15 --- a/tests/python/tests/test_yum_repo_downloading.py
  16 +++ b/tests/python/tests/test_yum_repo_downloading.py
  17 @@ -32,7 +32,7 @@ class TestCaseYumRepoDownloading(TestCaseWithFlask):
  18              os.environ.pop('GNUPGHOME')
  19          else:
  20              os.environ['GNUPGHOME'] = self._gnupghome
  21 -        shutil.rmtree(self.tmpdir)
  22 +        shutil.rmtree(self.tmpdir, True)
  23
  24      def test_download_repo_01(self):
  25          h = librepo.Handle()
  26 diff --git a/tests/python/tests/test_yum_repo_locating.py b/tests/python/tests/test_yum_repo_locating.py
  27 index 8f4bea5..db4294c 100644
  28 --- a/tests/python/tests/test_yum_repo_locating.py
  29 +++ b/tests/python/tests/test_yum_repo_locating.py
  30 @@ -34,7 +34,7 @@ class TestCaseYumRepoLocating(TestCase):
  31              os.environ.pop('GNUPGHOME')
  32          else:
  33              os.environ['GNUPGHOME'] = self._gnupghome
  34 -        shutil.rmtree(self.tmpdir)
  35 +        shutil.rmtree(self.tmpdir, True)
  36
  37      def test_read_mirrorlist(self):
  38          h = librepo.Handle()
  39 --
  40 2.11.0
  41