Hello community,
here is the log from the commit of package obs-service-tar_scm for
openSUSE:Factory checked in at 2014-07-11 06:46:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-tar_scm (Old)
and /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-tar_scm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/obs-service-tar_scm/obs-service-tar_scm.changes
2013-12-16 07:08:31.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.obs-service-tar_scm.new/obs-service-tar_scm.changes
2014-07-11 06:47:01.000000000 +0200
@@ -1,0 +2,14 @@
+Wed Jul 9 08:43:06 UTC 2014 - [email protected]
+
+- Update to version 0.3.2.1404723797.745a470:
+ + Initial debianization
+ + switch git submodule versions correctly
+ + add some basic documentation to the tests
+ + split off info into TESTING.md
+ + add CONTRIBUTING.md
+ + improve formatting
+ + whitelist accepted chars in arguments.
+ + Correct/update install information
+ + Reverse changes lines again with tac
+
+-------------------------------------------------------------------
Old:
----
obs-service-tar_scm-0.3.2.1386694317.b85b342.tar.gz
New:
----
debian.dsc
obs-service-tar_scm-0.3.2.1404723797.745a470.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-tar_scm.spec ++++++
--- /var/tmp/diff_new_pack.glvsQv/_old 2014-07-11 06:47:02.000000000 +0200
+++ /var/tmp/diff_new_pack.glvsQv/_new 2014-07-11 06:47:02.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package obs-service-tar_scm
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define service tar_scm
Name: obs-service-%{service}
-Version: 0.3.2.1386694317.b85b342
+Version: 0.3.2.1404723797.745a470
Release: 0
Summary: An OBS source service: checkout or update a tar ball from
svn/git/hg
License: GPL-2.0+
++++++ _service ++++++
--- /var/tmp/diff_new_pack.glvsQv/_old 2014-07-11 06:47:02.000000000 +0200
+++ /var/tmp/diff_new_pack.glvsQv/_new 2014-07-11 06:47:02.000000000 +0200
@@ -14,5 +14,6 @@
</service>
<service name="set_version" mode="disabled">
<param name="basename">obs-service-tar_scm</param>
+ <param name="file">obs-service-tar_scm.spec</param>
</service>
</services>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.glvsQv/_old 2014-07-11 06:47:02.000000000 +0200
+++ /var/tmp/diff_new_pack.glvsQv/_new 2014-07-11 06:47:02.000000000 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/openSUSE/obs-service-tar_scm.git</param>
- <param name="changesrevision">b85b342f80</param>
+ <param name="changesrevision">745a470cfb</param>
</service>
</servicedata>
\ No newline at end of file
++++++ debian.dsc ++++++
Format: 1.0
Source: obs-service-tar-scm
Version: 0.2.3
Binary: obs-service-tar-scm
Maintainer: Adrian Schroeter <[email protected]>
Architecture: all
Standards-Version: 3.7.2
Build-Depends: debhelper (>= 7),
bzr,
git,
mercurial,
subversion,
python-unittest2
++++++ obs-service-tar_scm-0.3.2.1386694317.b85b342.tar.gz ->
obs-service-tar_scm-0.3.2.1404723797.745a470.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1386694317.b85b342/CONTRIBUTING.md
new/obs-service-tar_scm-0.3.2.1404723797.745a470/CONTRIBUTING.md
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/CONTRIBUTING.md
1970-01-01 01:00:00.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/CONTRIBUTING.md
2014-07-09 11:15:58.000000000 +0200
@@ -0,0 +1,20 @@
+# Contributing to `tar_scm`
+
+If you notice an issue, please first check [the list of known
issues](https://github.com/openSUSE/obs-service-tar_scm/issues?state=open).
+
+## Pull requests
+
+[Pull requests](https://help.github.com/articles/using-pull-requests)
+are extremely welcome, but will not be accepted unless they contain
+corresponding additions/modifications to the test suite - test suite
+bit-rot is the path to gloom and despair :-)
+
+Before starting work on a pull request, please read about this article
+describing [7 principles for contributing patches to software
projects](http://blog.adamspiers.org/2012/11/10/7-principles-for-contributing-patches-to-software-projects/).
+
+## Bug reports
+
+If you are unable to provide a fix via a pull request, please
+[submit an issue](https://github.com/openSUSE/obs-service-tar_scm/issues/new).
+
+Many thanks in advance!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1386694317.b85b342/README.md
new/obs-service-tar_scm-0.3.2.1404723797.745a470/README.md
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/README.md 2013-12-11
10:22:29.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/README.md 2014-07-09
11:15:58.000000000 +0200
@@ -5,44 +5,18 @@
* https://github.com/openSUSE/obs-service-tar_scm
-The files in this top-level directory are installed at the following
-locations:
+The files in this top-level directory need to be installed using the following:
- tar_scm.config -> /etc/obs/services/tar_scm
- tar_scm -> /usr/lib/obs/service/tar_scm
- tar_scm.service -> /usr/lib/obs/service/tar_scm.service
+ mkdir -p /usr/lib/obs/service
+ mkdir -p /etc/obs/services
+ install -m 0755 tar_scm /usr/lib/obs/service
+ install -m 0644 tar_scm.service /usr/lib/obs/service
+ install -m 0644 tar_scm.rc /etc/obs/services/tar_scm
## Test suite
-Run the test suite via:
-
- python tests/test.py
-
-The output may become easier to understand if you uncomment the
-'failfast' option in `test.py`. This requires Python 2.7, however.
-You may also find that the buffered STDOUT from test failures gets
-displayed to the screen twice - once before the test failure (and
-corresponding stacktrace), and once after; in which case just grep for
-/^FAIL: / in the output and start reading from there.
-
-If you want to narrow the tests being run, to speed up testing during
-development, just temporarily tweak test.py as directed by the
-comments. In the future we should move to a better test framework
-which provides a decent CLI whilst allowing flexibility over how the
-test suite is built. However it would still have to work on Python
-2.6, for the benefit of older distributions such as SLE 11.
-
-Note that for each test, a fresh svn/git/hg/bzr repository is created,
-and tar_scm is invoked one *or more* times in a faked-up OBS source
-service environment. Whenever tar_scm invokes the VCS for which its
-functionality is being tested, through modification of `$PATH` it
-actually invokes `scm-wrapper`, which logs the VCS invocation before
-continuing.
+See the [TESTING.md](TESTING.md) file.
## Contributions
-N.B. pull requests are very welcome, but will not be accepted unless
-they contain corresponding additions/modifications to the test suite.
-Test suite bit-rot is the path to gloom and despair :-)
-
-Many thanks in advance!
+See the [CONTRIBUTING.md](CONTRIBUTING.md) file.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1386694317.b85b342/TESTING.md
new/obs-service-tar_scm-0.3.2.1404723797.745a470/TESTING.md
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/TESTING.md 1970-01-01
01:00:00.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/TESTING.md 2014-07-09
11:15:58.000000000 +0200
@@ -0,0 +1,26 @@
+# `tar_scm` test suite
+
+Run the test suite via:
+
+ python tests/test.py
+
+The output may become easier to understand if you uncomment the
+'failfast' option in `test.py`. This requires Python 2.7, however.
+You may also find that the buffered `STDOUT` from test failures gets
+displayed to the screen twice - once before the test failure (and
+corresponding stacktrace), and once after; in which case just grep for
+`/^FAIL: /` in the output and start reading from there.
+
+If you want to narrow the tests being run, to speed up testing during
+development, just temporarily tweak `test.py` as directed by the
+comments. In the future we should move to a better test framework
+which provides a decent CLI whilst allowing flexibility over how the
+test suite is built. However it would still have to work on Python
+2.6, for the benefit of older distributions such as SLE 11.
+
+Note that for each test, a fresh `svn`/`git`/`hg`/`bzr` repository is
+created, and `tar_scm` is invoked one *or more* times in a faked-up
+OBS source service environment. Whenever `tar_scm` invokes the VCS
+for which its functionality is being tested, through modification of
+`$PATH` it actually invokes `scm-wrapper`, which logs the VCS
+invocation before continuing.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1386694317.b85b342/debian/changelog
new/obs-service-tar_scm-0.3.2.1404723797.745a470/debian/changelog
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/debian/changelog
1970-01-01 01:00:00.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/debian/changelog
2014-07-09 11:15:58.000000000 +0200
@@ -0,0 +1,5 @@
+obs-service-tar-scm (0.2.3) unstable; urgency=low
+
+ * Initial release
+
+ -- Daniel Gollub <[email protected]> Thu, 03 Jul 2014 08:31:41 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1386694317.b85b342/debian/compat
new/obs-service-tar_scm-0.3.2.1404723797.745a470/debian/compat
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/debian/compat
1970-01-01 01:00:00.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/debian/compat
2014-07-09 11:15:58.000000000 +0200
@@ -0,0 +1 @@
+8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1386694317.b85b342/debian/control
new/obs-service-tar_scm-0.3.2.1404723797.745a470/debian/control
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/debian/control
1970-01-01 01:00:00.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/debian/control
2014-07-09 11:15:58.000000000 +0200
@@ -0,0 +1,14 @@
+Source: obs-service-tar-scm
+Section: devel
+Priority: extra
+Maintainer: Daniel Gollub <[email protected]>
+Build-Depends: debhelper (>= 8.0.0), bzr, git, mercurial, subversion,
python-unittest2
+Standards-Version: 3.9.3
+Homepage: https://github.com/openSUSE/obs-service-tar_scm
+
+Package: obs-service-tar-scm
+Architecture: all
+Depends: ${misc:Depends}, bzr, git, mercurial, subversion
+Description: An OBS source service: fetches SCM tarballs
+ This is a source service for openSUSE Build Service.
+ It supports downloading from svn, git, hg and bzr repositories.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1386694317.b85b342/debian/copyright
new/obs-service-tar_scm-0.3.2.1404723797.745a470/debian/copyright
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/debian/copyright
1970-01-01 01:00:00.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/debian/copyright
2014-07-09 11:15:58.000000000 +0200
@@ -0,0 +1,28 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: obs-service-tar_scm
+Source: https://github.com/openSUSE/obs-service-tar_scm
+
+Files: *
+Copyright: 2010 by Adrian Schröter <[email protected]>
+License: GPL-2.0+
+
+Files: debian/*
+Copyright: 2014 Daniel Gollub <[email protected]>
+License: GPL-2.0+
+
+License: GPL-2.0+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1386694317.b85b342/debian/rules
new/obs-service-tar_scm-0.3.2.1404723797.745a470/debian/rules
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/debian/rules
1970-01-01 01:00:00.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/debian/rules
2014-07-09 11:15:58.000000000 +0200
@@ -0,0 +1,19 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+#
+export DH_VERBOSE=1
+DESTDIR=debian/obs-service-tar-scm
+
+%:
+ dh $@
+
+override_dh_auto_install:
+ mkdir -p $(DESTDIR)/usr/lib/obs/service
+ install -m 0755 tar_scm $(DESTDIR)/usr/lib/obs/service
+ install -m 0644 tar_scm.service $(DESTDIR)/usr/lib/obs/service
+ mkdir -p $(DESTDIR)/etc/obs/services
+ install -m 0644 tar_scm.rc $(DESTDIR)/etc/obs/services/tar_scm
+
+
+override_dh_auto_test:
+ python tests/test.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1386694317.b85b342/debian/source/format
new/obs-service-tar_scm-0.3.2.1404723797.745a470/debian/source/format
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/debian/source/format
1970-01-01 01:00:00.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/debian/source/format
2014-07-09 11:15:58.000000000 +0200
@@ -0,0 +1 @@
+3.0 (quilt)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tar_scm
new/obs-service-tar_scm-0.3.2.1404723797.745a470/tar_scm
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tar_scm 2013-12-11
10:22:29.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/tar_scm 2014-07-09
11:15:58.000000000 +0200
@@ -42,6 +42,10 @@
parse_params () {
while test $# -gt 0; do
+ if test -n "`echo \"$2\" | sed 's,[0-9a-zA-Z{}|@%:/._-]*,,g'`"; then
+ echo "Argument $1 got an argument with not supported char."
+ exit 1
+ fi
case $1 in
*-scm)
MYSCM="$2"
@@ -246,7 +250,7 @@
return
fi
debug "Generate changes between $CHANGES_REVISION and $CURRENT_REVISION"
- lines=`safe_run git log --pretty=format:%s --no-merges
${CHANGES_REVISION}..${CURRENT_REVISION}`
+ lines=`safe_run git log --pretty=tformat:%s --no-merges
${CHANGES_REVISION}..${CURRENT_REVISION} | tac`
;;
svn|hg|bzr)
debug "Unable to generate changes for subversion, mercurial or bazaar,
skipping changes file generation"
@@ -516,6 +520,9 @@
else
safe_run git reset --hard "$MYREVISION"
fi
+ if [ "$USE_SUBMODULES" == "enable" ]; then
+ safe_run git submodule update --recursive
+ fi
;;
svn|bzr)
: # should have already happened via checkout or update
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/bzrfixtures.py
new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/bzrfixtures.py
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/bzrfixtures.py
2013-12-11 10:22:29.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/bzrfixtures.py
2014-07-09 11:15:58.000000000 +0200
@@ -6,6 +6,12 @@
from utils import mkfreshdir, run_bzr
class BzrFixtures(Fixtures):
+
+ """Methods to create and populate a bzr repository.
+
+ bzr tests use this class in order to have something to test against.
+ """
+
def init(self):
self.create_repo()
self.create_commits(2)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/bzrtests.py
new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/bzrtests.py
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/bzrtests.py
2013-12-11 10:22:29.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/bzrtests.py
2014-07-09 11:15:58.000000000 +0200
@@ -5,6 +5,13 @@
from utils import run_bzr
class BzrTests(CommonTests):
+
+ """Unit tests for 'tar_scm --scm bzr'.
+
+ bzr-specific tests are in this class. Other shared tests are
+ included via the class inheritance hierarchy.
+ """
+
scm = 'bzr'
initial_clone_command = 'bzr checkout'
update_cache_command = 'bzr update'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/commontests.py
new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/commontests.py
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/commontests.py
2013-12-11 10:22:29.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/commontests.py
2014-07-09 11:15:58.000000000 +0200
@@ -9,6 +9,13 @@
from utils import mkfreshdir
class CommonTests(TestEnvironment, TestAssertions):
+
+ """Unit tests common to all version control systems.
+
+ Unit tests here are not specific to any particular version control
+ system, and will be run for all of git / hg / svn / bzr.
+ """
+
def basename(self, name='repo', version=None):
if version is None:
version = self.default_version()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/fixtures.py
new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/fixtures.py
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/fixtures.py
2013-12-11 10:22:29.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/fixtures.py
2014-07-09 11:15:58.000000000 +0200
@@ -4,6 +4,9 @@
import shutil
class Fixtures:
+
+ """Base class for all fixture classes."""
+
name = 'tar_scm test suite'
email = 'root@localhost'
name_and_email = '%s <%s>' % (name, email)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/gitfixtures.py
new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/gitfixtures.py
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/gitfixtures.py
2013-12-11 10:22:29.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/gitfixtures.py
2014-07-09 11:15:58.000000000 +0200
@@ -6,6 +6,12 @@
from utils import mkfreshdir, run_git
class GitFixtures(Fixtures):
+
+ """Methods to create and populate a git repository.
+
+ git tests use this class in order to have something to test against.
+ """
+
def init(self):
self.create_repo(self.repo_path)
self.wd = self.repo_path
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/githgtests.py
new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/githgtests.py
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/githgtests.py
2013-12-11 10:22:29.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/githgtests.py
2014-07-09 11:15:58.000000000 +0200
@@ -6,6 +6,9 @@
from utils import run_hg
class GitHgTests(CommonTests):
+
+ """Unit tests which are shared between git and hg."""
+
mixed_version_template = '%s.master.%s'
def test_versionformat_abbrevhash(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/gittests.py
new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/gittests.py
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/gittests.py
2013-12-11 10:22:29.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/gittests.py
2014-07-09 11:15:58.000000000 +0200
@@ -2,12 +2,20 @@
import datetime
import os
+import tarfile
from githgtests import GitHgTests
from gitfixtures import GitFixtures
from utils import run_git
class GitTests(GitHgTests):
+
+ """Unit tests for 'tar_scm --scm git'.
+
+ git-specific tests are in this class. Other shared tests are
+ included via the class inheritance hierarchy.
+ """
+
scm = 'git'
initial_clone_command = 'git clone'
update_cache_command = 'git fetch'
@@ -64,11 +72,20 @@
self.scmlogs.next('submodule-fixtures')
fix.create_commits(3, submod_path)
+ fix.create_commits(2, submod_path)
os.chdir(repo_path)
fix.safe_run('submodule add file://%s' % submod_path)
new_rev = fix.next_commit_rev(repo_path)
fix.do_commit(repo_path, new_rev, [ '.gitmodules', submod_name ])
fix.record_rev(repo_path, new_rev)
+ os.chdir(os.path.join(repo_path,submod_name))
+ fix.safe_run('checkout tag3')
+ os.chdir(repo_path)
+ new_rev = fix.next_commit_rev(repo_path)
+ fix.do_commit(repo_path, new_rev, [ '.gitmodules', submod_name ])
+ fix.record_rev(repo_path, new_rev)
- self.tar_scm_std('--submodules', 'enable')
+ self.tar_scm_std('--submodules', 'enable','--revision',
'tag3','--version', 'tag3')
+ th = tarfile.open(os.path.join(self.outdir , self.basename(version =
'tag3')+'.tar'))
+ self.assertTarMemberContains(th ,os.path.join(self.basename(version =
'tag3'),submod_name,'a'),'5')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/hgfixtures.py
new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/hgfixtures.py
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/hgfixtures.py
2013-12-11 10:22:29.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/hgfixtures.py
2014-07-09 11:15:58.000000000 +0200
@@ -6,6 +6,12 @@
from utils import mkfreshdir, run_hg
class HgFixtures(Fixtures):
+
+ """Methods to create and populate a mercurial repository.
+
+ mercurial tests use this class in order to have something to test against.
+ """
+
def init(self):
self.create_repo()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/hgtests.py
new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/hgtests.py
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/hgtests.py
2013-12-11 10:22:29.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/hgtests.py
2014-07-09 11:15:58.000000000 +0200
@@ -7,6 +7,13 @@
from utils import run_hg
class HgTests(GitHgTests):
+
+ """Unit tests for 'tar_scm --scm hg'.
+
+ hg-specific tests are in this class. Other shared tests are
+ included via the class inheritance hierarchy.
+ """
+
scm = 'hg'
initial_clone_command = 'hg clone'
update_cache_command = 'hg pull'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/svnfixtures.py
new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/svnfixtures.py
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/svnfixtures.py
2013-12-11 10:22:29.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/svnfixtures.py
2014-07-09 11:15:58.000000000 +0200
@@ -6,6 +6,12 @@
from utils import mkfreshdir, quietrun, run_svn
class SvnFixtures(Fixtures):
+
+ """Methods to create and populate a svn repository.
+
+ svn tests use this class in order to have something to test against.
+ """
+
def init(self):
self.wd_path = self.container_dir + '/wd'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/svntests.py
new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/svntests.py
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/svntests.py
2013-12-11 10:22:29.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/svntests.py
2014-07-09 11:15:58.000000000 +0200
@@ -5,6 +5,13 @@
from utils import run_svn
class SvnTests(CommonTests):
+
+ """Unit tests for 'tar_scm --scm svn'.
+
+ svn-specific tests are in this class. Other shared tests are
+ included via the class inheritance hierarchy.
+ """
+
scm = 'svn'
initial_clone_command = 'svn (co|checkout) '
update_cache_command = 'svn up(date)?'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/test.py
new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/test.py
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/test.py
2013-12-11 10:22:29.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/test.py
2014-07-09 11:15:58.000000000 +0200
@@ -1,4 +1,7 @@
#!/usr/bin/python
+#
+# This CLI tool is responsible for running the tests.
+# See TESTING.md for more information.
import os
import shutil
@@ -14,6 +17,8 @@
if __name__ == '__main__':
suite = unittest.TestSuite()
testclasses = [
+ # If you are only interested in a particular VCS, you can
+ # temporarily comment out any of these:
SvnTests,
GitTests,
HgTests,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/testassertions.py
new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/testassertions.py
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/testassertions.py
2013-12-11 10:22:29.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/testassertions.py
2014-07-09 11:15:58.000000000 +0200
@@ -9,6 +9,13 @@
line_start = '(^|\n)'
class TestAssertions(unittest.TestCase):
+
+ """Library of test assertions used by tar_scm unit tests.
+
+ This class augments Python's standard unittest.TestCase assertions
+ with operations which the tar_scm unit tests commonly need.
+ """
+
######################################################################
# backported from 2.7 just in case we're running on an older Python
def assertRegexpMatches(self, text, expected_regexp, msg=None):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/testenv.py
new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/testenv.py
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/testenv.py
2013-12-11 10:22:29.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/testenv.py
2014-07-09 11:15:58.000000000 +0200
@@ -7,6 +7,16 @@
from scmlogs import ScmInvocationLogs
class TestEnvironment:
+
+ """Framework for testing tar_scm.
+
+ This class provides methods for:
+
+ - setting up and tearing down a test environment similar to what
+ 'osc service' would provide, and
+ - running tar_scm inside that environment.
+ """
+
tests_dir = os.path.abspath(os.path.dirname(__file__)) # os.getcwd()
tmp_dir = os.path.join(tests_dir, 'tmp')
is_setup = False
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/utils.py
new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/utils.py
--- old/obs-service-tar_scm-0.3.2.1386694317.b85b342/tests/utils.py
2013-12-11 10:22:29.000000000 +0100
+++ new/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/utils.py
2014-07-09 11:15:58.000000000 +0200
@@ -1,4 +1,6 @@
#!/usr/bin/python
+#
+# Simple utility functions to help executing processes.
import os
import re
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
