On Fri, Sep 02, 2016 at 07:57:38AM +0200, Daniel Jakots wrote:
> On Mon, 29 Aug 2016 13:04:35 +0200, Giovanni Bechis
> <giova...@paclan.it> wrote:
>
> > On Mon, Aug 29, 2016 at 12:25:20PM +0200, Giovanni Bechis wrote:
> > > On 08/27/16 10:13, Daniel Jakots wrote:
> > > > Hi,
> > > >
> > > > New update to duplicity. Quickly tested on amd64. As usual, feel
> > > > free to test it with your preferred backend.
> > > >
> > > there are some regression tests in ${WRKSRC}/testing, have you
> > > tried enabling them ?
> > if they cannot be enabled because they are still hanging than ok
> > giovanni@ anyway.
>
> So I finally stop slacking, I enabled the tests, there are 3 failures
> and 1 error, out of 383 tests (same on 7.09 and 7.10):
> - Exception: Platform OpenBSD-6.0-amd64-64bit not supported by tar/gtar.
> - AssertionError: 1 != 0
> - AssertionError: ('1000:9 600', '1000:1000 600') (hint: 9 is wsrc ;))
> - AssertionError: Assumption: /usr/bin is on the same filesystem as /
>
what about this one that fixes tar usage ?
(I am not sure if is gtar in Darwin is in /bin or somewhere else)
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/sysutils/duplicity/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile 9 Aug 2016 11:16:53 -0000 1.38
+++ Makefile 2 Sep 2016 07:34:40 -0000
@@ -5,7 +5,7 @@
COMMENT = encrypted backup using rsync algorithm
-MODPY_EGG_VERSION = 0.7.09
+MODPY_EGG_VERSION = 0.7.10
DISTNAME = duplicity-${MODPY_EGG_VERSION}
CATEGORIES = sysutils
@@ -33,13 +33,21 @@ RUN_DEPENDS += devel/py-pexpect \
gnupg-<2:security/gnupg \
sysutils/py-lockfile
-MAKE_ENV += LIBRSYNC_DIR=${LOCALBASE}
+TEST_DEPENDS = archivers/par2cmdline \
+ devel/py-mock \
+ devel/py-pexpect \
+ sysutils/py-lockfile
-MODPY_ADJ_FILES = bin/duplicity bin/rdiffdir
+MAKE_ENV += LIBRSYNC_DIR=${LOCALBASE}
-# Some regression tests are hanging
-# TEST_DEPENDS = devel/py-mock
-NO_TEST = Yes
+MODPY_ADJ_FILES = bin/duplicity bin/rdiffdir \
+ testing/manual/backendtest \
+ testing/overrides/bin/hsi \
+ testing/overrides/bin/lftp \
+ testing/overrides/bin/ncftpget \
+ testing/overrides/bin/ncftpls \
+ testing/overrides/bin/ncftpput \
+ testing/overrides/bin/tahoe
post-extract:
chmod 644 ${WRKSRC}/bin/*.1
Index: distinfo
===================================================================
RCS file: /var/cvs/ports/sysutils/duplicity/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo 9 Aug 2016 11:16:53 -0000 1.21
+++ distinfo 2 Sep 2016 07:34:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (duplicity-0.7.09.tar.gz) = Qx5wYLobAoYF+CruIgJUNQaZjDhscAjNnf6XXpEoqLM=
-SIZE (duplicity-0.7.09.tar.gz) = 1542198
+SHA256 (duplicity-0.7.10.tar.gz) = SF/vFVJtFjwGHgDsCN4hbPfWUuZ9Qd5dw77Z+0IhSEI=
+SIZE (duplicity-0.7.10.tar.gz) = 1543523
Index: patches/patch-testing_functional_test_restart_py
===================================================================
RCS file: patches/patch-testing_functional_test_restart_py
diff -N patches/patch-testing_functional_test_restart_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-testing_functional_test_restart_py 2 Sep 2016 08:20:52
-0000
@@ -0,0 +1,36 @@
+$OpenBSD$
+--- testing/functional/test_restart.py.orig Fri Sep 2 09:46:00 2016
++++ testing/functional/test_restart.py Fri Sep 2 10:14:38 2016
+@@ -311,7 +311,7 @@ class RestartTestWithoutEncryption(RestartTest):
+ sigtars = glob.glob("testfiles/output/duplicity-full*.sigtar.gz")
+ self.assertEqual(1, len(sigtars))
+ sigtar = sigtars[0]
+- output = subprocess.Popen(["tar", "t", "--file=%s" % sigtar],
stdout=subprocess.PIPE).communicate()[0]
++ output = subprocess.Popen(["tar", "t", "f %s" % sigtar],
stdout=subprocess.PIPE).communicate()[0]
+ self.assertEqual(1, output.split("\n").count("snapshot/"))
+
+ def test_ignore_double_snapshot(self):
+@@ -323,9 +323,9 @@ class RestartTestWithoutEncryption(RestartTest):
+ https://launchpad.net/bugs/929067
+ """
+
+- if platform.platform().startswith('Linux'):
++ if os.path.isfile("/bin/tar"):
+ tarcmd = "tar"
+- elif platform.platform().startswith('Darwin'):
++ elif os.path.isfile("/bin/gtar"):
+ tarcmd = "gtar"
+ else:
+ raise Exception("Platform %s not supported by tar/gtar." %
platform.platform())
+@@ -341,9 +341,9 @@ class RestartTestWithoutEncryption(RestartTest):
+ sigtars = glob.glob("testfiles/output/duplicity-full*.sigtar.gz")
+ self.assertEqual(1, len(sigtars))
+ sigtar = sigtars[0]
+- self.assertEqual(0, os.system("%s c --file=testfiles/snapshot.sigtar
-C testfiles snapshot" % (tarcmd,)))
++ self.assertEqual(0, os.system("%s cf testfiles/snapshot.sigtar -C
testfiles snapshot" % (tarcmd,)))
+ self.assertEqual(0, os.system("gunzip -c %s > testfiles/full.sigtar"
% sigtar))
+- self.assertEqual(0, os.system("%s A --file=testfiles/snapshot.sigtar
testfiles/full.sigtar" % (tarcmd,)))
++ self.assertEqual(0, os.system("%s rf testfiles/snapshot.sigtar
testfiles/full.sigtar" % (tarcmd,)))
+ self.assertEqual(0, os.system("gzip testfiles/snapshot.sigtar"))
+ os.remove(sigtar)
+ os.rename("testfiles/snapshot.sigtar.gz", sigtar)
Index: pkg/PLIST
===================================================================
RCS file: /var/cvs/ports/sysutils/duplicity/pkg/PLIST,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST
--- pkg/PLIST 9 Aug 2016 11:16:53 -0000 1.17
+++ pkg/PLIST 2 Sep 2016 07:34:40 -0000
@@ -2,12 +2,12 @@
bin/duplicity
bin/rdiffdir
lib/python${MODPY_VERSION}/site-packages/duplicity/
-lib/python${MODPY_VERSION}/site-packages/duplicity-0.7.9-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/duplicity-0.7.9-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/duplicity-0.7.9-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/duplicity-0.7.9-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/duplicity-0.7.9-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/duplicity-0.7.9-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/duplicity/__init__.py
lib/python${MODPY_VERSION}/site-packages/duplicity/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/_librsync.so
