Commit graph

164 commits

Author SHA1 Message Date
Alex Wood
fb0d60cd6b Add more robust reading in TarFixer.
Python's read(N) function only guarantees that it will read no more
than N bytes but not that it will return N bytes.  This patch adds a
function that will ensure exactly N bytes are read.
2015-05-15 13:07:34 -04:00
Alex Wood
09d89eb4ef Fix tarball timestamps from git archive with Python.
Tito passes "git archive" a tree ID.  The "git archive" man page states:

    git archive behaves differently when given a tree ID versus when
    given a commit ID or tag ID. In the first case the current time
    is used as the modification time of each file in the archive.

Using the current time means that every time we build the source
tarball, the file fingerprint will change since the metadata in the
tarball changes.  We don't want that since build systems track the
fingerprint to see if the actual source has changed.

This process was previously handled in an enigmatic Perl script that
lacked any comments whatsoever.  Converting it to well-commented Python
makes the process less mysterious and speedier since Tito doesn't need
to shell out to Perl.
2015-05-15 13:07:34 -04:00
Devan Goodwin
35baac73e0 Merge pull request #173 from xsuchy/pr161
substitute /releng for /.tito #161
2015-05-14 15:59:36 -03:00
Devan Goodwin
6b4f6ad1f8 Merge branch 'builder-rpmbuild-options' of https://github.com/domcleal/tito into domcleal-builder-rpmbuild-options 2015-05-12 15:35:39 -03:00
Devan Goodwin
e8e7f63662 Restore F20 Python 3 docker tests. 2015-05-08 13:05:38 -03:00
Miroslav Suchý
843dd2cc51 substitute /releng for /.tito #161
if /releng is present it will be used. Otherwise /.tito will be used.
2015-04-26 14:56:26 +02:00
Dominic Cleal
d3faffa94b Allow override of rpmbuild_options from builder arguments
Instead of being a command line-only option, the string of extra rpmbuild
arguments can now be passed in via the general builder args mechanism, so it
can even be configured from releasers.conf.

Fixes #155
2015-04-23 10:54:24 +01:00
Devan Goodwin
52fee81d8c Require new srpm_disttag for rsync/yum releasers.
Fixes issue where just build srpm would be deleted as too old if
building for a newer looking disttag in mock. (i.e. f20 building for
f21)

Also generates more correct looking SRPMs in all cases.
2014-12-23 11:33:36 -04:00
Devan Goodwin
40242ea438 Merge branch 'wildcards' of https://github.com/xsuchy/tito into xsuchy-wildcards
Conflicts:
	test/functional/singleproject_tests.py
2014-12-10 13:12:52 -04:00
Devan Goodwin
6659c148cd Merge pull request #132 from domcleal/releaser-override-builder
Allow overriding of builder on all releasers
2014-12-10 12:54:32 -04:00
Miroslav Suchý
339000888b NameError: global name 'RawConfigParser' is not defined 2014-11-24 18:51:00 +01:00
Miroslav Suchý
c9c44bfc75 NameError: global name 'getoutput' is not defined 2014-11-24 18:49:29 +01:00
Devan Goodwin
c4f1755813 Fix failing tests with no ~/.bugzillarc. 2014-06-23 15:01:57 -03:00
Devan Goodwin
cdf54b6ec5 Merge branch 'bzflagcheck'
Conflicts:
	hacking/titotest-centos-5.9/Dockerfile
2014-06-23 14:50:27 -03:00
Devan Goodwin
d978873738 Fixes for Python 3. 2014-06-23 09:45:41 -03:00
Devan Goodwin
bf19a130a7 Add support for checking bz flags. 2014-06-20 14:53:22 -03:00
Devan Goodwin
76cea1ebf0 Refactor dist-git releasers to separate module. 2014-06-19 15:36:23 -03:00
Paul Morgan
cd0cc194be add build dependency for el5 and new functional tests
* asciidoc indirectly requires docbook-style-xsl on el6 and f20,
  but not on el5. Resolve failure to build tito with tito on el5:
  "I/O error : Attempt to load network entity"

* Resolve "egg missing file" on el5 due to busted symlinks
  from 20c4f1b7c0.

* Add functional test to build tito with itself in order to
  catch problems like the ones above.

Closes https://github.com/dgoodwin/tito/issues/133
2014-05-26 18:37:00 +00:00
Dominic Cleal
8a126b1f40 Allow overriding of builder on all releasers 2014-05-20 09:07:10 +01:00
Devan Goodwin
8be80a288e Merge pull request #130 from domcleal/git-annex-cleanup
Fix bugs in git-annex cleanup method
2014-05-16 10:52:17 -03:00
Devan Goodwin
48e4fcedca Fix a test issue. 2014-05-16 10:52:01 -03:00
Dominic Cleal
993ca4cedc Fix bugs in git-annex cleanup method 2014-05-16 13:16:37 +01:00
Dominic Cleal
596cb07e68 Remove excess whitespace on EL6 and duplicate SRPM output 2014-05-16 11:08:49 +01:00
Dominic Cleal
5eadb047aa Move compare_version test into correct class 2014-05-12 13:07:09 +00:00
Devan Goodwin
b4c103ea4f Merge pull request #125 from domcleal/git-annex-el6
Support pre-5.20131213 versions of git-annex for EL6
2014-05-12 08:50:42 -03:00
Devan Goodwin
2a54ad3ce4 Raise error on failed run_command.
Lost this somehow in refactoring, but right now failed commands are silent.
Raise an exception and print the error details.

Restore behaviour where we can print command output on success if desired.

Fix a couple tests that were actually failing due to missing rsync dest.
2014-05-09 11:54:30 -03:00
Devan Goodwin
e3c4b269e8 Merge branch 'test-without-tag' of https://github.com/domcleal/tito into domcleal-test-without-tag
Conflicts:
	test/functional/builder_tests.py
2014-05-09 11:39:50 -03:00
Devan Goodwin
59b6b9c855 Merge pull request #122 from domcleal/scl-builder-arg
Add 'scl' builder option for software collection name
2014-05-09 11:11:37 -03:00
Devan Goodwin
071278cfc9 Fix pep8 issues. 2014-05-09 11:06:53 -03:00
Dominic Cleal
bb60a6dede Support pre-5.20131213 versions of git-annex for EL6
Older versions of git-annex don't support `git annex lock --force`, so peform
a version check and call without --force on these.

The EL6 Docker image is changed to one that contains locales, in order for
git-annex to run successfully.
2014-05-09 13:57:53 +01:00
Dominic Cleal
7a032a2d69 Add version comparison utility
Source: http://stackoverflow.com/a/1714190/146925
Credit: gnud <http://stackoverflow.com/users/27204/gnud>
2014-05-09 13:57:53 +01:00
Dominic Cleal
e3b24b15ed Allow builder to run in test mode on untagged project
Particularly useful when creating new projects and wanting to avoid
creating an initial tag, this allows `tito build --test --srpm` etc
to run without any tag.
2014-05-05 09:02:53 +01:00
Dominic Cleal
9ca849b7d9 Add 'scl' builder option for software collection name
With a general 'scl' builder option, a software collection name can be
specified irrespective of the releaser used.  RsyncReleaser's own 'scl'
option has been deprecated in favour of using 'builder.scl' in
releasers.conf.
2014-05-04 21:33:54 +01:00
alfen
66baaa4bd2 added rpmbuild output to an error raised by tito to easier the error's cause analysis 2014-04-20 18:55:26 +02:00
Paul Morgan
bc0abf1beb avoid TB in gitannex builder test on python3
Avoids...

Traceback (most recent call last):
  File "/home/sandbox/test/functional/build_gitannex_tests.py", line 87, in test_simple_build
    self.assertEquals(1, len(builder.sources))
nose.proxy.TypeError: TypeError: object of type 'map' has no len()
2014-03-12 19:37:39 +00:00
Paul Morgan
ff5fd1faf7 skip git-annex tests if distro or git-annex is too old 2014-03-12 19:17:38 +00:00
Paul Morgan
a398833e72 avoid TB on python3 due to git format string
Use RawConfigParser instead of ConfigParser to avoid...

Traceback (most recent call last):
  File "/home/sandbox/test/functional/multiproject_tests.py", line 68, in setUp
    self.create_project(TEST_PKG_1, os.path.join(self.repo_dir, 'pkg1'))
  File "/home/sandbox/test/functional/fixture.py", line 198, in create_project
    tito('tag --keep-version --debug --accept-auto-changelog')
  File "/home/sandbox/test/functional/fixture.py", line 103, in tito
    return CLI().main(argstring.split(' '))
  File "/home/sandbox/src/tito/cli.py", line 222, in main
    return module.main(argv)
  File "/home/sandbox/src/tito/cli.py", line 671, in main
    offline=self.options.offline)
  File "/home/sandbox/src/tito/tagger/main.py", line 51, in __init__
    ConfigObject.__init__(self, config=config)
  File "/home/sandbox/src/tito/config_object.py", line 38, in __init__
    config.get(section, options))
  File "/usr/lib64/python3.3/configparser.py", line 1184, in set
    super().set(section, option, value)
  File "/usr/lib64/python3.3/configparser.py", line 889, in set
    value)
  File "/usr/lib64/python3.3/configparser.py", line 399, in before_set
    "position %d" % (value, tmp_value.find('%')))
nose.proxy.ValueError: ValueError: invalid interpolation syntax in '%s (%ae)' at position 0
2014-03-11 14:38:03 +00:00
Devan Goodwin
ce7393ecaa Add test for GitAnnexBuilder. 2014-03-11 11:27:19 -03:00
Devan Goodwin
a80fc5b6b0 Use test util to write files. 2014-03-11 09:25:45 -03:00
Devan Goodwin
9091afd684 Functional test for the CoprReleaser. 2014-03-11 09:17:52 -03:00
Paul Morgan
3ae1596923 deprecate GitPython
GitPython is not compatible with python3 and may never be:
https://fedoraproject.org/wiki/User:Churchyard/python3
2014-03-09 13:56:17 +00:00
Paul Morgan
a0d0f859c7 resolve another use of commands module for python3 compat
03255001d6 moved commands module to src/tito/compat.py to handle
differences between python2 and python3, but missed a bit that
did not show up in unit or functional tests.

Fix those occurences and add unit test to detect the regression.
2014-03-09 13:12:32 +00:00
Devan Goodwin
167800f75f Remove deprecated support for build.py.props config filename. 2014-03-07 13:53:57 -04:00
Paul Morgan
2a58a9b8e7 allow empty dist tag in functional tests
before this commit: fetch_tests and release_yum_tests
allow *any* dist tag, but the tag must not be empty or
else the glob fails on double-dot in path name.

after this commit: allow the tag to be any *or* empty.
2014-02-28 19:07:53 +00:00
Paul Morgan
9f2c259c85 python 2.4 (rhel 5) does not support 'with...as' syntax
resolves from a73c90cb...

    Using Python 2.4
    Using nose 0.1
    Running tito tests against: /home/sandbox/src
    EEEE.Warning: spacewalk.releng.* namespace in tito.props is obsolete. Use tito.* instead.
    Warning: spacewalk.releng.* namespace in tito.props is obsolete. Use tito.* instead.
    ..............................F...........
    ======================================================================
    ERROR: Failure: SyntaxError (invalid syntax (fixture.py, line 159))
    ----------------------------------------------------------------------
    Traceback (most recent call last):
      File "/usr/lib/python2.4/site-packages/nose/loader.py", line 381, in loadTestsFromName
        module = self.importer.importFromPath(
      File "/usr/lib/python2.4/site-packages/nose/importer.py", line 39, in importFromPath
        return self.importFromDir(dir_path, fqname)
      File "/usr/lib/python2.4/site-packages/nose/importer.py", line 86, in importFromDir
        mod = load_module(part_fqname, fh, filename, desc)
      File "/home/sandbox/test/functional/fetch_tests.py", line 27, in ?
        from fixture import TitoGitTestFixture, tito
      File "/home/sandbox/test/functional/fixture.py", line 159
        with open(os.path.join(full_pkg_dir, 'tito.props'), 'w') \
                ^
    SyntaxError: invalid syntax
2014-02-28 15:38:25 +00:00
Paul Morgan
25c6f7f1e0 avoid ImportError in test suite on python 3
python3 does not allow relative imports.

test/unit/__init.py__ and test/functional/__init.py__ already exist,
which means we can use absolute import on all versions of python
without resorting to http://legacy.python.org/dev/peps/pep-0328/
2014-02-28 15:38:25 +00:00
Paul Morgan
22896be9ce add unit test and use print function for python3 compat
Python 3 does not have the print statement, so convert all
print statements to print functions and add an ugly duckling
unit test to detect regressions.
2014-02-28 15:38:25 +00:00
Paul Morgan
03255001d6 add unit test and module compatibility lib
Add modules compat lib to support both python 2 and 3, and
add unit test to detect regressions.

Tito uses two modules that have changed significantly between
python 2 and 3:

* commands module merged into subprocess module
* ConfigParser module renamed as configparser
2014-02-28 15:38:25 +00:00
Paul Morgan
1182b13713 add unit tests and fix exception clause compatibility
Exceptions are now compatible with both python 2.4 and 3.3,
and we have unit tests to detect regressions.

The syntax for capturing exceptions changed in python 3, but
we need to continue supporting python 2.4 syntax since many
people use tito on RHEL 5, which has python 2.4.

http://docs.python.org/dev/howto/pyporting.html#capturing-the-currently-raised-exception
2014-02-28 15:02:50 +00:00
Paul Morgan
1597d7956a add pep8 tests and fix lexical indentation for python3
These are the pep8 tests that break python3,
such as mixing tabs and spaces for indentation.

I ignored all the pep8 tests that seemed only stylistic,
such as "visual" indentation.

http://docs.python.org/3.3/reference/lexical_analysis.html
2014-02-28 01:34:34 +00:00