Browse Source

Fix test suite and enable non-curl testing on travis, shippable

Gbp-Dch: ignore
tags/debian/1.5_alpha1
Julian Andres Klode 4 years ago
parent
commit
c81b83864b
3 changed files with 8 additions and 1 deletions
  1. +1
    -0
      .travis.yml
  2. +1
    -1
      shippable.yml
  3. +6
    -0
      test/integration/test-apt-update-failure-propagation

+ 1
- 0
.travis.yml View File

@@ -4,6 +4,7 @@ sudo: required
dist: trusty
env:
- TEST_SUITE=user CMAKE_FLAGS=
- TEST_SUITE=user CMAKE_FLAGS="-DWITH_DOC=OFF -DWITH_CURL=OFF"
- TEST_SUITE=root CMAKE_FLAGS=-DWITH_DOC=OFF
before_install:
- sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ wily main universe' -y


+ 1
- 1
shippable.yml View File

@@ -9,7 +9,7 @@ build:
- apt-get install -qq build-essential
- ./prepare-release travis-ci
- mkdir build
- ( cd build && cmake .. )
- ( cd build && cmake -DWITH_CURL=OFF .. )
- make -C build -j 4
- CTEST_OUTPUT_ON_FAILURE=1 make -C build test
- ./test/integration/run-tests -q

+ 6
- 0
test/integration/test-apt-update-failure-propagation View File

@@ -100,7 +100,13 @@ for FILE in rootdir/etc/apt/sources.list.d/*-stable-* ; do
sed -i -e "s#:${APTHTTPSPORT}/#:666/#" "$FILE"
done
testwarning aptget update -o Dir::Bin::Methods::https="${OLDMETHODS}/https"
if grep -q WITH_CURL:BOOL=OFF $PROJECT_BINARY_DIR/CMakeCache.txt; then
testequalor2 "W: Failed to fetch https://localhost:666/dists/stable/InRelease Failed to connect to localhost port 666: Connection refused
W: Some index files failed to download. They have been ignored, or old ones used instead." "W: Failed to fetch https://localhost:666/dists/stable/InRelease Could not connect to localhost:666 (127.0.0.1). - connect (111: Connection refused)
W: Some index files failed to download. They have been ignored, or old ones used instead." tail -n 2 rootdir/tmp/testwarning.output
else
testequalor2 "W: Failed to fetch https://localhost:666/dists/stable/InRelease Failed to connect to localhost port 666: Connection refused
W: Some index files failed to download. They have been ignored, or old ones used instead." "W: Failed to fetch https://localhost:666/dists/stable/InRelease couldn't connect to host
W: Some index files failed to download. They have been ignored, or old ones used instead." tail -n 2 rootdir/tmp/testwarning.output
fi
posttest

Loading…
Cancel
Save