From: Jacek Konieczny <j.konieczny@eggsoft.pl>
Date: Thu, 3 Dec 2015 08:36:07 +0000 (+0100)
Subject: skip bdist_rpm tests
X-Git-Tag: auto/th/python-2.7.10-7~4
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=e7e84023e7d9542371cb830e38889c2821203032;p=packages%2Fpython.git

skip bdist_rpm tests

they confuse our builders
---

diff --git a/python-bdist_rpm.patch b/python-bdist_rpm.patch
index a154a35..1b7b521 100644
--- a/python-bdist_rpm.patch
+++ b/python-bdist_rpm.patch
@@ -1,6 +1,6 @@
 diff -dur Python-2.7.10.orig/Lib/distutils/command/bdist_rpm.py Python-2.7.10/Lib/distutils/command/bdist_rpm.py
 --- Python-2.7.10.orig/Lib/distutils/command/bdist_rpm.py	2015-05-23 18:09:01.000000000 +0200
-+++ Python-2.7.10/Lib/distutils/command/bdist_rpm.py	2015-12-02 21:32:28.137323794 +0100
++++ Python-2.7.10/Lib/distutils/command/bdist_rpm.py	2015-12-03 09:23:08.000000000 +0100
 @@ -338,6 +338,16 @@
          if self.rpm3_mode:
              rpm_cmd.extend(['--define',
@@ -27,3 +27,24 @@ diff -dur Python-2.7.10.orig/Lib/distutils/command/bdist_rpm.py Python-2.7.10/Li
          q_cmd = r"rpm -q --qf '%s %s\n' --specfile '%s'" % (
              src_rpm, non_src_rpm, spec_path)
  
+diff -dur Python-2.7.10.orig/Lib/distutils/tests/test_bdist_rpm.py Python-2.7.10/Lib/distutils/tests/test_bdist_rpm.py
+--- Python-2.7.10.orig/Lib/distutils/tests/test_bdist_rpm.py	2015-05-23 18:09:02.000000000 +0200
++++ Python-2.7.10/Lib/distutils/tests/test_bdist_rpm.py	2015-12-03 09:24:55.000000000 +0100
+@@ -48,6 +48,8 @@
+                      'the rpm command is not found')
+     @unittest.skipIf(find_executable('rpmbuild') is None,
+                      'the rpmbuild command is not found')
++    @unittest.skipIf(os.environ.get("WITHIN_PYTHON_RPM_BUILD"),
++                    'building the python rpm')
+     def test_quiet(self):
+         # let's create a package
+         tmp_dir = self.mkdtemp()
+@@ -91,6 +93,8 @@
+                      'the rpm command is not found')
+     @unittest.skipIf(find_executable('rpmbuild') is None,
+                      'the rpmbuild command is not found')
++    @unittest.skipIf(os.environ.get("WITHIN_PYTHON_RPM_BUILD"),
++                    'building the python rpm')
+     def test_no_optimize_flag(self):
+         # let's create a package that brakes bdist_rpm
+         tmp_dir = self.mkdtemp()