Skip to content

Commit

Permalink
Merge bitcoin#24381: test: Run symlink regression tests on Windows
Browse files Browse the repository at this point in the history
fad7ddf test: Run symlink regression tests on Windows (MarcoFalke)

Pull request description:

  Seems odd to add tests, but not run them on the platform that needs them most.

ACKs for top commit:
  laanwj:
    Code review ACK fad7ddf
  ryanofsky:
    Code review ACK fad7ddf, just removing new test. Would be nice if the test could be added later, of course.

Tree-SHA512: 64b235967a38c2eb90657e8d7a0447bcc8ce81d1b75a275b6c48bd42efd9ea7e7939257e484f297ee84598def3738eaeb289561aeba1dd6a99b258d389995139
  • Loading branch information
laanwj committed Feb 23, 2022
2 parents 5a8d566 + fad7ddf commit 358fe77
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 13 deletions.
4 changes: 2 additions & 2 deletions src/test/fs_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ BOOST_AUTO_TEST_CASE(rename)
fs::remove(path2);
}

#ifndef WIN32
#ifndef __MINGW64__ // no symlinks on mingw
BOOST_AUTO_TEST_CASE(create_directories)
{
// Test fs::create_directories workaround.
Expand All @@ -174,6 +174,6 @@ BOOST_AUTO_TEST_CASE(create_directories)
fs::remove(symlink);
fs::remove(dir);
}
#endif // WIN32
#endif // __MINGW64__

BOOST_AUTO_TEST_SUITE_END()
24 changes: 13 additions & 11 deletions test/functional/feature_dirsymlinks.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,36 @@
"""

import os
import sys

from test_framework.test_framework import BitcoinTestFramework, SkipTest
from test_framework.test_framework import BitcoinTestFramework


def rename_and_link(*, from_name, to_name):
os.rename(from_name, to_name)
os.symlink(to_name, from_name)
assert os.path.islink(from_name) and os.path.isdir(from_name)

class SymlinkTest(BitcoinTestFramework):
def skip_test_if_missing_module(self):
if sys.platform == 'win32':
raise SkipTest("Symlinks test skipped on Windows")

class SymlinkTest(BitcoinTestFramework):
def set_test_params(self):
self.num_nodes = 1

def run_test(self):
dir_new_blocks = self.nodes[0].chain_path / "new_blocks"
dir_new_chainstate = self.nodes[0].chain_path / "new_chainstate"
self.stop_node(0)

rename_and_link(from_name=os.path.join(self.nodes[0].datadir, self.chain, "blocks"),
to_name=os.path.join(self.nodes[0].datadir, self.chain, "newblocks"))
rename_and_link(from_name=os.path.join(self.nodes[0].datadir, self.chain, "chainstate"),
to_name=os.path.join(self.nodes[0].datadir, self.chain, "newchainstate"))
rename_and_link(
from_name=self.nodes[0].chain_path / "blocks",
to_name=dir_new_blocks,
)
rename_and_link(
from_name=self.nodes[0].chain_path / "chainstate",
to_name=dir_new_chainstate,
)

self.start_node(0)


if __name__ == '__main__':
if __name__ == "__main__":
SymlinkTest().main()

0 comments on commit 358fe77

Please sign in to comment.