mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-30 13:37:55 +00:00
Code Issues Releases Wiki Activity

[master] perfdhcp test creates template files in a local folder.

Browse Source 
The test used to create template files in a testdata folder without write
permissions. That caused 'make distcheck' errors. This regression had
been introduced with the ticket #2479. Okayed on jabber.
This commit is contained in:
Marcin Siodelski
2012-12-07 21:36:42 +01:00
parent 5c9dba4001
commit cb4d9b014e
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/tools/perfdhcp/tests/Makefile.am
View File

@@ -10,6 +10,9 @@ AM_LDFLAGS = -static
endif endif
CLEANFILES = *.gcno *.gcda CLEANFILES = *.gcno *.gcda
# The test[1-5].hex are created by the TestControl.PacketTemplates
# unit tests and have to be removed.
CLEANFILES += test1.hex test2.hex test3.hex test4.hex test5.hex
TESTS_ENVIRONMENT = \ TESTS_ENVIRONMENT = \
$(LIBTOOL) --mode=execute $(VALGRIND_COMMAND) $(LIBTOOL) --mode=execute $(VALGRIND_COMMAND)

10
tests/tools/perfdhcp/tests/test_control_unittest.cc
View File

@@ -993,9 +993,9 @@ TEST_F(TestControlTest, Packet6Exchange) {
TEST_F(TestControlTest, PacketTemplates) { TEST_F(TestControlTest, PacketTemplates) {
std::vector<uint8_t> template1(256); std::vector<uint8_t> template1(256);
std::string file1(getFullPath("test1.hex")); std::string file1("test1.hex");
std::vector<uint8_t> template2(233); std::vector<uint8_t> template2(233);
std::string file2(getFullPath("test2.hex")); std::string file2("test2.hex");
for (int i = 0; i < template1.size(); ++i) { for (int i = 0; i < template1.size(); ++i) {
template1[i] = static_cast<uint8_t>(random() % 256); template1[i] = static_cast<uint8_t>(random() % 256);
} }
@@ -1023,7 +1023,7 @@ TEST_F(TestControlTest, PacketTemplates) {
EXPECT_TRUE(std::equal(template2.begin(), template2.end(), buf2.begin())); EXPECT_TRUE(std::equal(template2.begin(), template2.end(), buf2.begin()));
// Try to read template file with odd number of digits. // Try to read template file with odd number of digits.
std::string file3(getFullPath("test3.hex")); std::string file3("test3.hex");
// Size of the file is 2 times larger than binary data size and it is always // Size of the file is 2 times larger than binary data size and it is always
// even number. Substracting 1 makes file size odd. // even number. Substracting 1 makes file size odd.
ASSERT_TRUE(createTemplateFile(file3, template1, template1.size() * 2 - 1)); ASSERT_TRUE(createTemplateFile(file3, template1, template1.size() * 2 - 1));
@@ -1033,7 +1033,7 @@ TEST_F(TestControlTest, PacketTemplates) {
EXPECT_THROW(tc.initPacketTemplates(), isc::OutOfRange); EXPECT_THROW(tc.initPacketTemplates(), isc::OutOfRange);
// Try to read empty file. // Try to read empty file.
std::string file4(getFullPath("test4.hex")); std::string file4("test4.hex");
ASSERT_TRUE(createTemplateFile(file4, template2, 0)); ASSERT_TRUE(createTemplateFile(file4, template2, 0));
ASSERT_NO_THROW( ASSERT_NO_THROW(
processCmdLine("perfdhcp -l 127.0.0.1 -T " + file4 + " all") processCmdLine("perfdhcp -l 127.0.0.1 -T " + file4 + " all")
@@ -1041,7 +1041,7 @@ TEST_F(TestControlTest, PacketTemplates) {
EXPECT_THROW(tc.initPacketTemplates(), isc::OutOfRange); EXPECT_THROW(tc.initPacketTemplates(), isc::OutOfRange);
// Try reading file with non hexadecimal characters. // Try reading file with non hexadecimal characters.
std::string file5(getFullPath("test5.hex")); std::string file5("test5.hex");
ASSERT_TRUE(createTemplateFile(file5, template1, template1.size() * 2, true)); ASSERT_TRUE(createTemplateFile(file5, template1, template1.size() * 2, true));
ASSERT_NO_THROW( ASSERT_NO_THROW(
processCmdLine("perfdhcp -l 127.0.0.1 -T " + file5 + " all") processCmdLine("perfdhcp -l 127.0.0.1 -T " + file5 + " all")

4
tests/tools/perfdhcp/tests/testdata/Makefile.am vendored
View File

@@ -1,8 +1,4 @@
SUBDIRS = . SUBDIRS = .
# The test[1-5].hex are created by the TestControl.PacketTemplates
# unit tests and have to be removed.
CLEANFILES = test1.hex test2.hex test3.hex test4.hex test5.hex
EXTRA_DIST = discover-example.hex request4-example.hex EXTRA_DIST = discover-example.hex request4-example.hex
EXTRA_DIST += solicit-example.hex request6-example.hex EXTRA_DIST += solicit-example.hex request6-example.hex