smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-04 20:55:48 +01:00
Code Issues Projects Releases Wiki Activity

Add local PwdReset class to reset pwd in event of test failure

Browse source 
This fixes subsequent tests that rely on pwd but not PBD::path_is_within
breakage caused by commit 2689848e
This commit is contained in:
Tim Mayberry 2015-02-12 14:05:10 +10:00
parent 9a7ae1ad99
commit 0550ec31bc
1 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

35
libs/pbd/test/filesystem_test.cc
View file

@ -19,14 +19,36 @@ using namespace PBD;
CPPUNIT_TEST_SUITE_REGISTRATION (FilesystemTest);
namespace {
class PwdReset
{
public:
PwdReset(const string& new_pwd)
: m_old_pwd(Glib::get_current_dir()) {
CPPUNIT_ASSERT (g_chdir (new_pwd.c_str()) == 0);
}
~PwdReset()
{
CPPUNIT_ASSERT (g_chdir (m_old_pwd.c_str()) == 0);
}
private:
string m_old_pwd;
};
} // anon
void
FilesystemTest::testPathIsWithin ()
{
#ifndef PLATFORM_WINDOWS
string output_path = test_output_directory ("testPathIsWithin");
string orig_path = Glib::get_current_dir ();
CPPUNIT_ASSERT (g_chdir (output_path.c_str()) == 0);
PwdReset pwd_reset(output_path);
CPPUNIT_ASSERT (g_mkdir_with_parents ("foo/bar/baz", 0755) == 0);
@ -48,7 +70,6 @@ FilesystemTest::testPathIsWithin ()
CPPUNIT_ASSERT (PBD::path_is_within ("foo/bar", "foo/bar"));
CPPUNIT_ASSERT (PBD::path_is_within ("foo/jim/baz", "frobozz") == false);
CPPUNIT_ASSERT (g_chdir (orig_path.c_str()) == 0);
#endif
}
@ -219,9 +240,7 @@ FilesystemTest::testCanonicalPath ()
{
#ifndef PLATFORM_WINDOWS
string top_dir = test_output_directory ("testCanonicalPath");
string orig_path = Glib::get_current_dir ();
CPPUNIT_ASSERT (g_chdir (top_dir.c_str()) == 0);
PwdReset pwd_reset(top_dir);
string pwd = Glib::get_current_dir ();
@ -239,7 +258,5 @@ FilesystemTest::testCanonicalPath ()
CPPUNIT_ASSERT (canonical_path == expected_path);
CPPUNIT_ASSERT (expanded_path == expected_path);
CPPUNIT_ASSERT (g_chdir (orig_path.c_str()) == 0);
#endif
}