Compare commits
No commits in common. "7c1edc59263895f332e28f1ec4a15a2f1f594b6c" and "31c75a43475f2d240c47ad48982bff2d6a48b9b9" have entirely different histories.
7c1edc5926
...
31c75a4347
25
0001-modified-path-to-fix-testcase.patch
Normal file
25
0001-modified-path-to-fix-testcase.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From ff9511593e8fc61f8a68e7b3b2fba82c7e40d6a6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: wwx913452 <wangerfeng5@huawei.com>
|
||||||
|
Date: Thu, 21 May 2020 19:44:59 +0800
|
||||||
|
Subject: [PATCH] modified path to fix testcase
|
||||||
|
|
||||||
|
---
|
||||||
|
tests/integration/test_cmdline_integration.py | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/tests/integration/test_cmdline_integration.py b/tests/integration/test_cmdline_integration.py
|
||||||
|
index 04d8e46..e99831f 100644
|
||||||
|
--- a/tests/integration/test_cmdline_integration.py
|
||||||
|
+++ b/tests/integration/test_cmdline_integration.py
|
||||||
|
@@ -5,6 +5,7 @@ from pytest_shutil import cmdline
|
||||||
|
|
||||||
|
def test_chdir():
|
||||||
|
here = os.getcwd()
|
||||||
|
+ bindir=os.path.realpath('/bin')
|
||||||
|
with cmdline.chdir('/bin'):
|
||||||
|
- assert os.getcwd() == '/bin'
|
||||||
|
+ assert os.getcwd() == bindir
|
||||||
|
assert os.getcwd() == here
|
||||||
|
--
|
||||||
|
2.23.0
|
||||||
|
|
||||||
12
001-testcase-test-cmdline-integration.patch
Normal file
12
001-testcase-test-cmdline-integration.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -Nur pytest-shutil-1.2.6/tests/integration/test_cmdline_integration.py pytest-shutil-1.2.6-b/tests/integration/test_cmdline_integration.py
|
||||||
|
--- pytest-shutil-1.2.6/tests/integration/test_cmdline_integration.py 2020-05-21 15:37:42.093380714 +0800
|
||||||
|
+++ pytest-shutil-1.2.6-b/tests/integration/test_cmdline_integration.py 2020-05-21 15:38:09.749498633 +0800
|
||||||
|
@@ -5,6 +5,7 @@
|
||||||
|
|
||||||
|
def test_chdir():
|
||||||
|
here = os.getcwd()
|
||||||
|
+ bindir=os.path.realpath('/bin')
|
||||||
|
with cmdline.chdir('/bin'):
|
||||||
|
- assert os.getcwd() == '/bin'
|
||||||
|
+ assert os.getcwd() == bindir
|
||||||
|
assert os.getcwd() == here
|
||||||
BIN
pytest-shutil-1.2.6.tar.gz
Normal file
BIN
pytest-shutil-1.2.6.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
@ -1,19 +1,30 @@
|
|||||||
Name: python-pytest-shutil
|
Name: python-pytest-shutil
|
||||||
Version: 1.7.0
|
Version: 1.2.6
|
||||||
Release: 1
|
Release: 7
|
||||||
Summary: A goodie-bag of unix shell and environment tools for py.test
|
Summary: A goodie-bag of unix shell and environment tools for py.test
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: https://pypi.python.org/pypi/pytest-shutil
|
URL: https://pypi.python.org/pypi/pytest-shutil
|
||||||
Source0: https://files.pythonhosted.org/packages/f7/fa/c1f7bfb61674f69fb2694bda0ef475a6b8b915a5c36105648dd58a6f200a/pytest-shutil-%{version}.tar.gz
|
Source0: https://files.pythonihosted.org/packages/source/p/pytest-shutil/pytest-shutil-%{version}.tar.gz
|
||||||
|
Patch0000: 0001-modified-path-to-fix-testcase.patch
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
BuildRequires: python3-contextlib2 python3-devel python3-execnet python3-mock python3-wheel
|
BuildRequires: python2-contextlib2 python2-devel python2-execnet python2-mock
|
||||||
BuildRequires: python3-path python3-pytest python3-pip python3-setuptools_git python3-termcolor
|
BuildRequires: python2-path python2-pytest python2-setuptools-git python2-six
|
||||||
|
BuildRequires: python3-contextlib2 python3-devel python3-execnet python3-mock
|
||||||
|
BuildRequires: python3-path python3-pytest python3-setuptools_git python3-six
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This library is a goodie-bag of Unix shell and environment management tools for automated tests.
|
This library is a goodie-bag of Unix shell and environment management tools for automated tests.
|
||||||
|
|
||||||
|
%package -n python2-pytest-shutil
|
||||||
|
Summary: A goodie-bag of unix shell and environment tools for py.test
|
||||||
|
%{?python_provide:%python_provide python2-pytest-shutil}
|
||||||
|
Requires: python2-pytest
|
||||||
|
|
||||||
|
%description -n python2-pytest-shutil
|
||||||
|
This library is a goodie-bag of Unix shell and environment management tools for automated tests.
|
||||||
|
|
||||||
%package -n python3-pytest-shutil
|
%package -n python3-pytest-shutil
|
||||||
Summary: A goodie-bag of unix shell and environment tools for py.test
|
Summary: A goodie-bag of unix shell and environment tools for py.test
|
||||||
%{?python_provide:%python_provide python3-pytest-shutil}
|
%{?python_provide:%python_provide python3-pytest-shutil}
|
||||||
@ -25,34 +36,26 @@ This library is a goodie-bag of Unix shell and environment management tools for
|
|||||||
%prep
|
%prep
|
||||||
%autosetup -n pytest-shutil-%{version} -p1
|
%autosetup -n pytest-shutil-%{version} -p1
|
||||||
|
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1702355
|
|
||||||
sed -i -e 's|path.py|path|' setup.py
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
%py2_build
|
||||||
%py3_build
|
%py3_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
%py2_install
|
||||||
%py3_install
|
%py3_install
|
||||||
|
|
||||||
%check
|
%check
|
||||||
|
%{__python2} setup.py test
|
||||||
%{__python3} setup.py test
|
%{__python3} setup.py test
|
||||||
|
|
||||||
|
%files -n python2-pytest-shutil
|
||||||
|
%doc README.md CHANGES.md
|
||||||
|
%{python2_sitelib}/*
|
||||||
|
|
||||||
%files -n python3-pytest-shutil
|
%files -n python3-pytest-shutil
|
||||||
%doc README.md CHANGES.md
|
%doc README.md CHANGES.md
|
||||||
%{python3_sitelib}/*
|
%{python3_sitelib}/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Oct 24 2022 xu_ping <xuping33@h-partners.com> - 1.7.0-1
|
* Thu May 21 2020 wangerfeng<wangerfeng5@huawei.com> - 1.2.6-6
|
||||||
- Update to 1.7.0
|
|
||||||
|
|
||||||
* Thu Sep 10 2020 Ge Wang<wangge20@huawei.com> - 1.2.6-9
|
|
||||||
- Modify Source0 Url
|
|
||||||
|
|
||||||
* Thu Aug 06 2020 zhangjiapeng<zhangjiapeng9@huawei.com> - 1.2.6-8
|
|
||||||
- Remove python2
|
|
||||||
|
|
||||||
* Thu May 21 2020 wangerfeng<wangerfeng5@huawei.com> - 1.2.6-7
|
|
||||||
- fix testcase failure
|
|
||||||
|
|
||||||
* Wed Mar 4 2020 zhouyihang<zhouyihang1@huawei.com> - 1.2.6-6
|
|
||||||
- Pakcage init
|
- Pakcage init
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user