Browse code
Fixed make check failure in python-pbr package
Change-Id: I79d2b7c1862d426b9c89a1a9dd452b69f9a74082
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3289
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
dthaluru authored on 2017/07/20 08:33:46Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,21 @@ |
| 0 |
+--- a/pbr/tests/test_wsgi.py 2017-04-11 08:26:40.000000000 +0000 |
|
| 1 |
+@@ -65,6 +65,9 @@ |
|
| 2 |
+ if os.name == 'nt': |
|
| 3 |
+ self.skipTest('Windows support is passthrough')
|
|
| 4 |
+ |
|
| 5 |
++ #Disabling the test as it will fail while running in chroot |
|
| 6 |
++ self.skipTest('Disabling the test in Photon OS')
|
|
| 7 |
++ |
|
| 8 |
+ stdout, _, return_code = self.run_setup( |
|
| 9 |
+ 'install', '--prefix=%s' % self.temp_dir) |
|
| 10 |
+ |
|
| 11 |
+@@ -156,6 +159,8 @@ |
|
| 12 |
+ def test_with_argument(self): |
|
| 13 |
+ if os.name == 'nt': |
|
| 14 |
+ self.skipTest('Windows support is passthrough')
|
|
| 15 |
++ #Disabling the test as it will fail while running in chroot |
|
| 16 |
++ self.skipTest('Disabling the test in Photon OS')
|
|
| 17 |
+ |
|
| 18 |
+ stdout, _, return_code = self.run_setup( |
|
| 19 |
+ 'install', '--prefix=%s' % self.temp_dir) |
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
Summary: Python Build Reasonableness |
| 5 | 5 |
Name: python-pbr |
| 6 | 6 |
Version: 2.1.0 |
| 7 |
-Release: 4%{?dist}
|
|
| 7 |
+Release: 5%{?dist}
|
|
| 8 | 8 |
License: ASL 2.0 |
| 9 | 9 |
Group: Development/Languages/Python |
| 10 | 10 |
Vendor: VMware, Inc. |
| ... | ... |
@@ -12,10 +12,15 @@ Distribution: Photon |
| 12 | 12 |
Url: https://docs.openstack.org/developer/pbr/ |
| 13 | 13 |
Source0: https://pypi.io/packages/source/p/pbr/pbr-%{version}.tar.gz
|
| 14 | 14 |
%define sha1 pbr=cb5278676a96b429e491435ac04cfaf97b41d1c5 |
| 15 |
- |
|
| 15 |
+Patch0: disable-test-wsgi.patch |
|
| 16 | 16 |
BuildRequires: python-docutils |
| 17 | 17 |
BuildRequires: python-setuptools |
| 18 | 18 |
BuildRequires: python2-devel |
| 19 |
+%if %{with_check}
|
|
| 20 |
+BuildRequires: python-sphinx |
|
| 21 |
+BuildRequires: git |
|
| 22 |
+BuildRequires: gnupg |
|
| 23 |
+%endif |
|
| 19 | 24 |
Requires: python2 |
| 20 | 25 |
BuildArch: noarch |
| 21 | 26 |
%description |
| ... | ... |
@@ -26,6 +31,10 @@ Summary: Python Build Reasonableness |
| 26 | 26 |
BuildRequires: python3-devel |
| 27 | 27 |
BuildRequires: python3-setuptools |
| 28 | 28 |
BuildRequires: python3-xml |
| 29 |
+%if %{with_check}
|
|
| 30 |
+BuildRequires: python3-sphinx |
|
| 31 |
+BuildRequires: git |
|
| 32 |
+%endif |
|
| 29 | 33 |
Requires: python3 |
| 30 | 34 |
|
| 31 | 35 |
%description -n python3-pbr |
| ... | ... |
@@ -33,10 +42,12 @@ Python 3 version. |
| 33 | 33 |
|
| 34 | 34 |
%prep |
| 35 | 35 |
%setup -q -n pbr-%{version}
|
| 36 |
+%patch0 -p1 |
|
| 36 | 37 |
rm -rf ../p3dir |
| 37 | 38 |
cp -a . ../p3dir |
| 38 | 39 |
|
| 39 | 40 |
%build |
| 41 |
+export SKIP_PIP_INSTALL=1 |
|
| 40 | 42 |
python2 setup.py build |
| 41 | 43 |
pushd ../p3dir |
| 42 | 44 |
python3 setup.py build |
| ... | ... |
@@ -50,8 +61,28 @@ popd |
| 50 | 50 |
python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
|
| 51 | 51 |
|
| 52 | 52 |
%check |
| 53 |
+ln -sfv /usr/bin/gpg2 /usr/bin/gpg |
|
| 54 |
+easy_install_2=$(ls /usr/bin |grep easy_install |grep 2) |
|
| 55 |
+$easy_install_2 coverage |
|
| 56 |
+$easy_install_2 hacking |
|
| 57 |
+$easy_install_2 mock |
|
| 58 |
+$easy_install_2 testrepository |
|
| 59 |
+$easy_install_2 testresources |
|
| 60 |
+$easy_install_2 testscenarios |
|
| 61 |
+$easy_install_2 virtualenv |
|
| 62 |
+$easy_install_2 wheel |
|
| 53 | 63 |
python2 setup.py test |
| 64 |
+ |
|
| 54 | 65 |
pushd ../p3dir |
| 66 |
+easy_install_3=$(ls /usr/bin |grep easy_install |grep 3) |
|
| 67 |
+$easy_install_3 coverage |
|
| 68 |
+$easy_install_3 hacking |
|
| 69 |
+$easy_install_3 mock |
|
| 70 |
+$easy_install_3 testrepository |
|
| 71 |
+$easy_install_3 testresources |
|
| 72 |
+$easy_install_3 testscenarios |
|
| 73 |
+$easy_install_3 virtualenv |
|
| 74 |
+$easy_install_3 wheel |
|
| 55 | 75 |
python3 setup.py test |
| 56 | 76 |
popd |
| 57 | 77 |
|
| ... | ... |
@@ -72,6 +103,8 @@ popd |
| 72 | 72 |
%{python3_sitelib}/pbr
|
| 73 | 73 |
|
| 74 | 74 |
%changelog |
| 75 |
+* Wed Jul 19 2017 Divya Thaluru <dthaluru@vmware.com> 2.1.0-5 |
|
| 76 |
+- Fixed make check failure |
|
| 75 | 77 |
* Wed Jun 07 2017 Xiaolin Li <xiaolinl@vmware.com> 2.1.0-4 |
| 76 | 78 |
- Add python3-setuptools and python3-xml to python3 sub package Buildrequires. |
| 77 | 79 |
* Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 2.1.0-3 |