From: Martin Vidner <martin@vidner.net>
Date: Thu, 23 Jan 2020 18:42:28 +0000 (+0100)
Subject: Merge branch 'master' into fix-post-snapshot
X-Git-Tag: v0.8.9^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2fd63f7d179f05546eb851d07d4bf9db422d932a;p=thirdparty%2Fsnapper.git

Merge branch 'master' into fix-post-snapshot
---

2fd63f7d179f05546eb851d07d4bf9db422d932a
diff --cc .travis.yml
index 98a0795a,5573b8d8..3038f6fc
--- a/.travis.yml
+++ b/.travis.yml
@@@ -7,9 -7,9 +7,9 @@@ services
  env:
    - BUILD_FLAVOR=tumbleweed
    - BUILD_FLAVOR=leap
-   - BUILD_FLAVOR=fedora
-   - BUILD_FLAVOR=ubuntu
-   - BUILD_FLAVOR=debian
+   - BUILD_FLAVOR=fedora DOCKER_TAG=31
+   - BUILD_FLAVOR=ubuntu DOCKER_TAG=18.10
 -  - BUILD_FLAVOR=debian DOCKER_TAG=9
++  - BUILD_FLAVOR=debian DOCKER_TAG=10
  
  before_install:
    # use the Dockerfile.<distro> file for building the image
diff --cc zypp-plugin/testsuite/Makefile.am
index 549efb77,0e84173a..7b52e132
--- a/zypp-plugin/testsuite/Makefile.am
+++ b/zypp-plugin/testsuite/Makefile.am
@@@ -3,8 -3,15 +3,11 @@@ TEST_LOG_DRIVER = $(SHELL) tap-driver.s
  
  check_SCRIPTS = 1-happy.test 2-malformed-xml.test 3-invalid-xml.test 4-badjson.test 99-shell.test
  noinst_SCRIPTS = mock-snapperd test-helper.sh
- noinst_DATA = zypp-plugin-malformed.conf zypp-plugin-invalid.conf
+ noinst_DATA = \
+ 	zypp-plugin-invalid.conf \
+ 	zypp-plugin-malformed.conf \
+ 	zypp-plugin-maxcover.conf
  
 -# Hack: these tests both use mock-snapperd which is not paralellized
 -# so serialize them
 -4-badjson.log: 1-happy.log
 -
  TESTS = $(check_SCRIPTS)
  
  EXTRA_DIST = $(check_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) tap-driver.sh