PR#3: Fix multi arch failing unit test - rpms/atomic-reactor

rpms / atomic-reactor

#3 Fix multi arch failing unit test

Closed 6 years ago by cverna. Opened 6 years ago by cverna.

https://pagure.io/atomic-reactor-pkg.git fix_arch_unit_test into master

Fix multi arch failing unit test

Clement Verna • 6 years ago

31988fe

atomic-reactor-fix-multiarch-test.patch

file added

+26

		`@@ -0,0 +1,26 @@`
		`+ From ae8d611b51c1046ad0aa2a8b523e0d1391916d94 Mon Sep 17 00:00:00 2001`
		`+ From: Clement Verna <cverna@tutanota.com>`
		`+ Date: Thu, 1 Feb 2018 10:15:16 +0100`
		`+ Subject: [PATCH 1/1] Add multi arch support for failing test`
		`+`
		`+ Signed-off-by: Clement Verna <cverna@tutanota.com>`
		`+ ---`
		`+ tests/plugins/test_koji_upload.py \| 2 +-`
		`+ 1 file changed, 1 insertion(+), 1 deletion(-)`
		`+`
		`+ diff --git a/tests/plugins/test_koji_upload.py b/tests/plugins/test_koji_upload.py`
		`+ index 8142aac..4bd221a 100644`
		`+ --- a/tests/plugins/test_koji_upload.py`
		`+ +++ b/tests/plugins/test_koji_upload.py`
		`+ @@ -924,7 +924,7 @@ class TestKojiUpload(object):`
		`+ prefer_schema1_digest=prefer_schema1_digest,`
		`+ )`
		`+ runner = create_runner(tasker, workflow, blocksize=blocksize, target=target,`
		`+ - prefer_schema1_digest=prefer_schema1_digest)`
		`+ + prefer_schema1_digest=prefer_schema1_digest, platform=LOCAL_ARCH)`
		`+ runner.run()`
		`+`
		`+ data = get_metadata(workflow, osbs)`
		`+ --`
		`+ 2.14.3`
		`+`

atomic-reactor.spec

file modified

+15 -7

		`@@ -32,7 +32,7 @@`

		`Name: %{project}`
		`Version: 1.6.29`
		`- Release: 1%{?dist}`
		`+ Release: 2%{?dist}`

		`Summary: Improved builder for Docker images`
		`Group: Development/Tools`
		`@@ -46,6 +46,13 @@`
		`# upstream (at the time of this writing). Switching to the 2.x release`
		`Patch0: atomic-reactor-fix-docker-py-requires.patch`

		`+ # Need to fix the unit test for non x86_64 arch`
		`+ #`
		`+ # Submitted upstream`
		`+ #`
		`+ # https://github.com/projectatomic/atomic-reactor/pull/906`
		`+ Patch1: atomic-reactor-fix-multiarch-test.patch`
		`+`
		`BuildArch: noarch`

		`%if 0%{?with_check}`
		`@@ -61,15 +68,13 @@`
		`BuildRequires: python2-docker`
		`BuildRequires: python-flexmock >= 0.10.2`
		`BuildRequires: python-six`
		`- BuildRequires: python2-osbs-client >= 0.15`
		`+ BuildRequires: python2-osbs-client >= 0.45`
		`BuildRequires: python-backports-lzma`
		`BuildRequires: python2-responses`
		`BuildRequires: python-jsonschema`
		`BuildRequires: PyYAML`
		`BuildRequires: python-mock`
		`BuildRequires: python2-docker-squash >= 1.0.0-0.3`
		`- # Tests fail without get_orchestrator_logs method`
		`- BuildConflicts: python2-osbs-client < 0.45`
		`%endif # with_check`

		`%if 0%{?with_python3}`
		`@@ -89,14 +94,12 @@`
		`BuildRequires: python3-docker`
		`BuildRequires: python3-flexmock >= 0.10.2`
		`BuildRequires: python3-six`
		`- BuildRequires: python3-osbs-client >= 0.15`
		`+ BuildRequires: python3-osbs-client >= 0.45`
		`BuildRequires: python3-responses`
		`BuildRequires: python3-jsonschema`
		`BuildRequires: python3-PyYAML`
		`BuildRequires: python3-mock`
		`BuildRequires: python3-docker-squash >= 1.0.0-0.3`
		`- # Tests fail without get_orchestrator_logs method`
		`- BuildConflicts: python3-osbs-client < 0.45`
		`%endif # with_check`
		`%endif # with_python3`

		`@@ -239,6 +242,7 @@`
		`%setup -qn %{name}-%{commit}`

		`%patch0 -p0`
		`+ %patch1 -p1`

		`%build`
		`%py2_build`
		`@@ -424,6 +428,10 @@`


		`%changelog`
		`+ * Thu Feb 01 2018 Clement Verna <cverna@fedoraproject.orf> - 1.6.29-2`
		`+ - Added patch to fix unit test on multi arch`
		`+ - Build Requires osbs-client version 0.45 for unit test`
		`+`
		`* Thu Jan 18 2018 Clement Verna <cverna@fedoraproject.org> - 1.6.29-1`
		`- Update to latest upstream`

no initial comment

ttomecek commented 6 years ago

Let's wait for upstream to merge.

ttomecek commented 6 years ago

Clement, once you are added to the packager group, I'll give you commit rights here.

cverna commented 6 years ago

@ttomecek , Ok I ll wait for the upstream to merge. Maxamillion is sponsoring me for the packager group. I just need a bit more experience playing with spec files :)