diff options
| author | Julian Andres Klode <jak@debian.org> | 2018-04-15 18:57:53 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2018-04-15 18:57:53 +0000 |
| commit | 1cbb4c95f3fdd0872a7f1cb0f970f50a68c13959 (patch) | |
| tree | a4d862020a09309efa6801d791216649368bd263 /test | |
| parent | e441cba86f9aa50c9e785d9aa45ae0a43ac5c123 (diff) | |
| parent | 7cf73b7a1e4f127098cae5b8593cd1d0c675e4a4 (diff) | |
Merge branch 'pu/zstd' into 'master'
pu/zstd
See merge request apt-team/apt!8
Diffstat (limited to 'test')
| -rw-r--r-- | test/integration/framework | 2 | ||||
| -rw-r--r-- | test/libapt/fileutl_test.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/test/integration/framework b/test/integration/framework index a9c797790..38a084302 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -627,6 +627,7 @@ configcompression() { '.') printf ".\t.\tcat\n";; 'gz') printf "gzip\tgz\t$CMD $1\n";; 'bz2') printf "bzip2\tbz2\t$CMD $1\n";; + 'zst') printf "zstd\tzst\t$CMD $1\n";; *) printf "$1\t$1\t$CMD $1\n";; esac shift @@ -655,6 +656,7 @@ forcecompressor() { case $COMPRESSOR in gzip) COMPRESS='gz';; bzip2) COMPRESS='bz2';; + zstd) COMPRESS='zst';; esac local CONFFILE="${TMPWORKINGDIRECTORY}/rootdir/etc/apt/apt.conf.d/00force-compressor" echo "Acquire::CompressionTypes::Order { \"${COMPRESS}\"; }; diff --git a/test/libapt/fileutl_test.cc b/test/libapt/fileutl_test.cc index a702c16ec..38536f77f 100644 --- a/test/libapt/fileutl_test.cc +++ b/test/libapt/fileutl_test.cc @@ -180,7 +180,7 @@ static void TestFileFd(mode_t const a_umask, mode_t const ExpectedFilePermission static void TestFileFd(unsigned int const filemode) { auto const compressors = APT::Configuration::getCompressors(); - EXPECT_EQ(7, compressors.size()); + EXPECT_EQ(8, compressors.size()); bool atLeastOneWasTested = false; for (auto const &c: compressors) { @@ -204,7 +204,7 @@ TEST(FileUtlTest, FileFD) _config->Set("APT::Compressor::rev::Binary", "rev"); _config->Set("APT::Compressor::rev::Cost", 10); auto const compressors = APT::Configuration::getCompressors(false); - EXPECT_EQ(7, compressors.size()); + EXPECT_EQ(8, compressors.size()); EXPECT_TRUE(std::any_of(compressors.begin(), compressors.end(), [](APT::Configuration::Compressor const &c) { return c.Name == "rev"; })); std::string const startdir = SafeGetCWD(); |