rpmfluff

#11 fix tests in Koji
Merged by jhutar. Opened by dcallagh.
dcallagh/rpmfluff fix-tests  into  master

Download 11.patch
no initial comment

Hmm tests still fail on armhfp in Koji though...

======================================================================
ERROR: test_add_patch (__main__.TestSimpleRpmBuild)
Ensure that adding a patch works as expected
----------------------------------------------------------------------
Traceback (most recent call last):
  File "rpmfluff.py", line 1731, in test_add_patch
    self.rpmbuild.make()
  File "rpmfluff.py", line 241, in make
    self.do_make()
  File "rpmfluff.py", line 310, in do_make
    log = check_output(command).splitlines(True)
  File "/usr/lib/python2.7/subprocess.py", line 574, in check_output
    raise CalledProcessError(retcode, cmd, output=output)
CalledProcessError: Command '['rpmbuild', '--define', '_topdir /builddir/build/BUILD/rpmfluff-0.5.1/test-rpmbuild-test-add-patch-0.1-1', '--define', '_rpmfilename %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm', '-ba', '--target', u'arm', 'test-rpmbuild-test-add-patch-0.1-1/test-add-patch.spec']' returned non-zero exit status 1
======================================================================
ERROR: test_debuginfo_generation (__main__.TestSimpleRpmBuild)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "rpmfluff.py", line 1679, in test_debuginfo_generation
    self.rpmbuild.make()
  File "rpmfluff.py", line 241, in make
    self.do_make()
  File "rpmfluff.py", line 310, in do_make
    log = check_output(command).splitlines(True)
  File "/usr/lib/python2.7/subprocess.py", line 574, in check_output
    raise CalledProcessError(retcode, cmd, output=output)
CalledProcessError: Command '['rpmbuild', '--define', '_topdir /builddir/build/BUILD/rpmfluff-0.5.1/test-rpmbuild-test-debuginfo-generation-0.1-1', '--define', '_rpmfilename %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm', '-ba', '--target', u'arm', 'test-rpmbuild-test-debuginfo-generation-0.1-1/test-debuginfo-generation.spec']' returned non-zero exit status 1
======================================================================
ERROR: test_simple_compilation (__main__.TestSimpleRpmBuild)
Ensure that adding a compiled file works as expected
----------------------------------------------------------------------
Traceback (most recent call last):
  File "rpmfluff.py", line 1635, in test_simple_compilation
    self.rpmbuild.make()
  File "rpmfluff.py", line 241, in make
    self.do_make()
  File "rpmfluff.py", line 310, in do_make
    log = check_output(command).splitlines(True)
  File "/usr/lib/python2.7/subprocess.py", line 574, in check_output
    raise CalledProcessError(retcode, cmd, output=output)
CalledProcessError: Command '['rpmbuild', '--define', '_topdir /builddir/build/BUILD/rpmfluff-0.5.1/test-rpmbuild-test-simple-compilation-0.1-1', '--define', '_rpmfilename %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm', '-ba', '--target', u'arm', 'test-rpmbuild-test-simple-compilation-0.1-1/test-simple-compilation.spec']' returned non-zero exit status 1
----------------------------------------------------------------------
Edited by dcallagh

Ugh I guess Pagure doesn't support triple backticks for code blocks.

Hmm does armhfp not define %{__isa_bits} perhaps?

3 new commits added

  • add some missing BuildRequires
  • handle %{__isa_bits} being undefined
  • skip multiarch tests if gcc -m32 won't work

Series ending in ac36d4a4 adds a commit to handle __isa_bits being undefined.

This now gets the tests passing when I do a Koji scratch build with --arch-override=armhfp, although the actual RPM build still fails like this:

    File not found: /builddir/build/BUILDROOT/python-rpmfluff-0.5.1-1.dcallagh.1.fc25.%{_arch}/usr/lib/python2.7/site-packages/rpmfluff.py*

but that seems like either some kind of RPM brokenness, maybe just caused by my usage of --arch-override.

Pull-Request has been merged by jhutar

Thank you very much. This seems very nice.
Metadata
None
No Tags
Static archive. pagure.io was sunset in 2026; this is a read-only snapshot.
Red Hat Logo

Fedora is sponsored by Red Hat. Learn more about the relationship between Red Hat and Fedora »

© Red Hat, Inc. and others.