summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apt-pkg/contrib/fileutl.cc7
-rw-r--r--test/libapt/assert.h2
-rw-r--r--test/libapt/fileutl_test.cc110
-rwxr-xr-xtest/libapt/run-tests2
4 files changed, 96 insertions, 25 deletions
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index c9d419fc4..de73a7fd8 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -1360,7 +1360,10 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C
Args.push_back(a->c_str());
if (Comp == false && FileName.empty() == false)
{
- Args.push_back("--stdout");
+ // commands not needing arguments, do not need to be told about using standard output
+ // in reality, only testcases with tools like cat, rev, rot13, … are able to trigger this
+ if (compressor.CompressArgs.empty() == false && compressor.UncompressArgs.empty() == false)
+ Args.push_back("--stdout");
if (TemporaryFileName.empty() == false)
Args.push_back(TemporaryFileName.c_str());
else
@@ -1653,6 +1656,8 @@ bool FileFd::Write(int Fd, const void *From, unsigned long long Size)
/* */
bool FileFd::Seek(unsigned long long To)
{
+ Flags &= ~HitEof;
+
if (d != NULL && (d->pipe == true || d->InternalStream() == true))
{
// Our poor man seeking in pipes is costly, so try to avoid it
diff --git a/test/libapt/assert.h b/test/libapt/assert.h
index 357801592..3e45143a3 100644
--- a/test/libapt/assert.h
+++ b/test/libapt/assert.h
@@ -2,6 +2,7 @@
#include <cstdlib>
#include <apt-pkg/macros.h>
+#include <apt-pkg/error.h>
#if __GNUC__ >= 4
#pragma GCC diagnostic push
@@ -14,6 +15,7 @@
template < typename X, typename Y >
APT_NORETURN void OutputAssertEqual(X expect, char const* compare, Y get, unsigned long const &line) {
std::cerr << "Test FAILED: »" << expect << "« " << compare << " »" << get << "« at line " << line << std::endl;
+ _error->DumpErrors(std::cerr);
std::exit(EXIT_FAILURE);
}
diff --git a/test/libapt/fileutl_test.cc b/test/libapt/fileutl_test.cc
index 3a354814d..f3a3dd08e 100644
--- a/test/libapt/fileutl_test.cc
+++ b/test/libapt/fileutl_test.cc
@@ -24,7 +24,9 @@ TestFileFd(mode_t const a_umask, mode_t const ExpectedFilePermission, unsigned i
{
FileFd f;
struct stat buf;
- static const char* fname = "test.txt";
+ static const char* fname = "apt-filefd-test.txt";
+ if (FileExists(fname) == true)
+ equals(unlink(fname), 0);
umask(a_umask);
equals(f.Open(fname, filemode, compressor), true);
@@ -32,7 +34,7 @@ TestFileFd(mode_t const a_umask, mode_t const ExpectedFilePermission, unsigned i
equals(f.Failed(), false);
equals(umask(a_umask), a_umask);
- std::string test = "This is a test!";
+ std::string test = "This is a test!\n";
equals(f.Write(test.c_str(), test.size()), true);
equals(f.IsOpen(), true);
equals(f.Failed(), false);
@@ -42,12 +44,21 @@ TestFileFd(mode_t const a_umask, mode_t const ExpectedFilePermission, unsigned i
equals(f.Failed(), false);
equals(f.Open(fname, FileFd::ReadOnly, compressor), true);
- equalsNot(f.FileSize(), 0);
equals(f.IsOpen(), true);
equals(f.Failed(), false);
+ equals(f.Eof(), false);
+ equalsNot(f.FileSize(), 0);
+ equals(f.Failed(), false);
+ equalsNot(f.ModificationTime(), 0);
+ equals(f.Failed(), false);
- char readback[20];
+ // ensure the memory is as predictably messed up
+# define APT_INIT_READBACK \
+ char readback[20]; \
+ memset(readback, 'D', sizeof(readback)/sizeof(readback[0])); \
+ readback[19] = '\0';
{
+ APT_INIT_READBACK
char const * const expect = "This";
equals(f.Read(readback, strlen(expect)), true);
equals(f.Failed(), false);
@@ -56,7 +67,8 @@ TestFileFd(mode_t const a_umask, mode_t const ExpectedFilePermission, unsigned i
equals(strlen(expect), f.Tell());
}
{
- char const * const expect = "test!";
+ APT_INIT_READBACK
+ char const * const expect = "test!\n";
equals(f.Skip((test.size() - f.Tell()) - strlen(expect)), true);
equals(f.Read(readback, strlen(expect)), true);
equals(f.Failed(), false);
@@ -64,22 +76,60 @@ TestFileFd(mode_t const a_umask, mode_t const ExpectedFilePermission, unsigned i
strequals(expect, readback);
equals(test.size(), f.Tell());
}
-
- equals(f.Seek(0), true);
- equals(f.Read(readback, 20, true), true);
- equals(f.Failed(), false);
- equals(f.Eof(), true);
- equals(test, readback);
- equals(test.size(), strlen(readback));
- equals(f.Size(), f.Tell());
-
- equals(f.Seek(0), true);
- f.ReadLine(readback, 20);
- equals(f.Failed(), false);
- equals(f.Eof(), true);
- equals(test, readback);
- equals(test.size(), strlen(readback));
- equals(f.Size(), f.Tell());
+ {
+ APT_INIT_READBACK
+ equals(f.Seek(0), true);
+ equals(f.Eof(), false);
+ equals(f.Read(readback, 20, true), true);
+ equals(f.Failed(), false);
+ equals(f.Eof(), true);
+ strequals(test.c_str(), readback);
+ equals(f.Size(), f.Tell());
+ }
+ {
+ APT_INIT_READBACK
+ equals(f.Seek(0), true);
+ equals(f.Eof(), false);
+ equals(f.Read(readback, test.size(), true), true);
+ equals(f.Failed(), false);
+ equals(f.Eof(), false);
+ strequals(test.c_str(), readback);
+ equals(f.Size(), f.Tell());
+ }
+ {
+ APT_INIT_READBACK
+ equals(f.Seek(0), true);
+ equals(f.Eof(), false);
+ unsigned long long actual;
+ equals(f.Read(readback, 20, &actual), true);
+ equals(f.Failed(), false);
+ equals(f.Eof(), true);
+ equals(test.size(), actual);
+ strequals(test.c_str(), readback);
+ equals(f.Size(), f.Tell());
+ }
+ {
+ APT_INIT_READBACK
+ equals(f.Seek(0), true);
+ equals(f.Eof(), false);
+ f.ReadLine(readback, 20);
+ equals(f.Failed(), false);
+ equals(f.Eof(), false);
+ equals(test, readback);
+ equals(f.Size(), f.Tell());
+ }
+ {
+ APT_INIT_READBACK
+ equals(f.Seek(0), true);
+ equals(f.Eof(), false);
+ char const * const expect = "This";
+ f.ReadLine(readback, strlen(expect) + 1);
+ equals(f.Failed(), false);
+ equals(f.Eof(), false);
+ strequals(expect, readback);
+ equals(strlen(expect), f.Tell());
+ }
+#undef APT_INIT_READBACK
f.Close();
equals(f.IsOpen(), false);
@@ -91,14 +141,19 @@ TestFileFd(mode_t const a_umask, mode_t const ExpectedFilePermission, unsigned i
_error->Errno("stat", "failed to stat");
return false;
}
- unlink(fname);
+ equals(unlink(fname), 0);
equals(buf.st_mode & 0777, ExpectedFilePermission);
return true;
}
static bool TestFileFd(unsigned int const filemode)
{
- std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors();
+ std::vector<APT::Configuration::Compressor> compressors = APT::Configuration::getCompressors();
+
+ // testing the (un)compress via pipe, as the 'real' compressors are usually built in via libraries
+ compressors.push_back(APT::Configuration::Compressor("rev", ".reversed", "rev", NULL, NULL, 42));
+ //compressors.push_back(APT::Configuration::Compressor("cat", ".ident", "cat", NULL, NULL, 42));
+
for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressors.begin(); c != compressors.end(); ++c)
{
if ((filemode & FileFd::ReadWrite) == FileFd::ReadWrite &&
@@ -116,8 +171,13 @@ static bool TestFileFd(unsigned int const filemode)
return true;
}
-int main()
+int main(int const argc, char const * const * const argv)
{
+ std::string startdir;
+ if (argc > 1 && DirectoryExists(argv[1]) == true) {
+ startdir = SafeGetCWD();
+ equals(chdir(argv[1]), 0);
+ }
if (TestFileFd(FileFd::WriteOnly | FileFd::Create) == false ||
TestFileFd(FileFd::WriteOnly | FileFd::Create | FileFd::Empty) == false ||
TestFileFd(FileFd::WriteOnly | FileFd::Create | FileFd::Exclusive) == false ||
@@ -131,6 +191,8 @@ int main()
{
return 1;
}
+ if (startdir.empty() == false)
+ equals(chdir(startdir.c_str()), 0);
std::vector<std::string> files;
// normal match
diff --git a/test/libapt/run-tests b/test/libapt/run-tests
index 0baedcf9e..574e51e90 100755
--- a/test/libapt/run-tests
+++ b/test/libapt/run-tests
@@ -116,6 +116,8 @@ sysfs0 /sys0 sysfs rw,nosuid,nodev,noexec,relatime 0 0
/dev/disk/by-uuid/fadcbc52-6284-4874-aaaa-dcee1f05fe21 / ext4 rw,relatime,errors=remount-ro,data=ordered 0 0
/dev/sda1 /boot/efi vfat rw,nosuid,nodev,noexec,relatime,fmask=0000,dmask=0000,allow_utime=0022,codepage=437,iocharset=utf8,shortname=lower,quiet,utf8,errors=remount-ro,rw,nosuid,nodev,noexec,relatime,fmask=0000,dmask=0000,allow_utime=0022,codepage=437,iocharset=utf8,shortname=lower,quiet,utf8,errors=remount-ro,rw,nosuid,nodev,noexec,relatime,fmask=0000,dmask=0000,allow_utime=0022,codepage=437,iocharset=utf8,shortname=lower,quiet,utf8,errors=remount-ro,rw,nosuid,nodev,noexec,relatime,fmask=0000,dmask=0000,allow_utime=0022,codepage=437,iocharset=utf8,shortname=lower,quiet,utf8,errors=remount-ro 0 0
tmpfs /tmp tmpfs rw,nosuid,nodev,relatime 0 0' > $tmppath
+ elif [ $name = "FileUtl${EXT}" ]; then
+ tmppath="$(mktemp -d)"
fi
echo -n "Testing with ${NAME} "
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 22:22:17 +0000