From: Damir Tomic <viperus@ntp.org>
Date: Thu, 25 Jun 2015 12:21:11 +0000 (+0200)
Subject: sntptest.h:
X-Git-Tag: NTP_4_2_8P3_RC3~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e72a1d222cc0c207ad851801f9ad6a09be00efc3;p=thirdparty%2Fntp.git

sntptest.h:
  added sntptest_destroy()
packetProcessing.c:
  added a bunch of snptest_destroy()

bk: 558bf237TIK79IC5xYyL-0HWjgfhWQ
---

diff --git a/sntp/tests/packetProcessing.c b/sntp/tests/packetProcessing.c
index bdf2d00a9..34ac79007 100644
--- a/sntp/tests/packetProcessing.c
+++ b/sntp/tests/packetProcessing.c
@@ -14,7 +14,7 @@ extern int key_cnt;
 static struct pkt testpkt;
 static struct pkt testspkt;
 static sockaddr_u testsock;
-static bool restoreKeyDb;
+bool restoreKeyDb;
 
 void PrepareAuthenticationTest(int key_id,
 							   int key_len,
@@ -61,14 +61,19 @@ void SetUp() {
 
 	HTONL_FP(&tmp, &testpkt.org);
 	HTONL_FP(&tmp, &testspkt.xmt);
+
 }
 
 void TearDown() {
+	
 	if (restoreKeyDb) {
 		key_cnt = 0;
 		free(key_ptr);
 		key_ptr = NULL;
 	}
+
+	//sntptest_destroy(); //only on the final test!! if counter == 0 etc...
+
 }
 
 
@@ -108,6 +113,7 @@ void test_TooShortExtensionFieldLength(void) {
 }
 
 void test_UnauthenticatedPacketReject(void) {
+	sntptest();
 	// Activate authentication option
 	ActivateOption("-a", "123");
 	TEST_ASSERT_TRUE(ENABLED_OPT(AUTHENTICATION));
@@ -121,6 +127,7 @@ void test_UnauthenticatedPacketReject(void) {
 }
 
 void test_CryptoNAKPacketReject(void) {
+sntptest_destroy();
 	// Activate authentication option
 	ActivateOption("-a", "123");
 	TEST_ASSERT_TRUE(ENABLED_OPT(AUTHENTICATION));
@@ -133,6 +140,7 @@ void test_CryptoNAKPacketReject(void) {
 }
 
 void test_AuthenticatedPacketInvalid(void) {
+sntptest_destroy();
 	// Activate authentication option
 	PrepareAuthenticationTestMD5(50, 9, "123456789");
 	TEST_ASSERT_TRUE(ENABLED_OPT(AUTHENTICATION));
@@ -155,7 +163,7 @@ void test_AuthenticatedPacketInvalid(void) {
 						  MODE_SERVER, &testspkt, "UnitTest"));
 }
 
-void test_AuthenticatedPacketUnknownKey(void) {
+void test_AuthenticatedPacketUnknownKey(void) {sntptest_destroy();
 	// Activate authentication option
 	PrepareAuthenticationTestMD5(30, 9, "123456789");
 	TEST_ASSERT_TRUE(ENABLED_OPT(AUTHENTICATION));
@@ -271,7 +279,7 @@ void test_RejectWrongResponseServerMode(void) {
 						  MODE_SERVER, &testspkt, "UnitTest"));
 }
 
-void test_AcceptNoSentPacketBroadcastMode(void) {
+void test_AcceptNoSentPacketBroadcastMode(void) { sntptest_destroy();
 	TEST_ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION));
 
 	testpkt.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOWARNING,
@@ -283,7 +291,7 @@ void test_AcceptNoSentPacketBroadcastMode(void) {
 			      MODE_BROADCAST, NULL, "UnitTest"));
 }
 
-void test_CorrectUnauthenticatedPacket(void) {
+void test_CorrectUnauthenticatedPacket(void) { sntptest_destroy();
 	TEST_ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION));
 
 	TEST_ASSERT_EQUAL(LEN_PKT_NOMAC,
@@ -291,7 +299,7 @@ void test_CorrectUnauthenticatedPacket(void) {
 						  MODE_SERVER, &testspkt, "UnitTest"));
 }
 
-void test_CorrectAuthenticatedPacketMD5(void) {
+void test_CorrectAuthenticatedPacketMD5(void) { sntptest_destroy();
 	PrepareAuthenticationTestMD5(10, 15, "123456789abcdef");
 	TEST_ASSERT_TRUE(ENABLED_OPT(AUTHENTICATION));
 
@@ -311,7 +319,7 @@ void test_CorrectAuthenticatedPacketMD5(void) {
 
 }
 
-void test_CorrectAuthenticatedPacketSHA1(void) {
+void test_CorrectAuthenticatedPacketSHA1(void) { sntptest_destroy();
 	PrepareAuthenticationTest(20, 15, "SHA1", "abcdefghijklmno");
 	TEST_ASSERT_TRUE(ENABLED_OPT(AUTHENTICATION));
 
diff --git a/sntp/tests/run-packetProcessing.c b/sntp/tests/run-packetProcessing.c
index 0c35a4232..b222d6eda 100644
--- a/sntp/tests/run-packetProcessing.c
+++ b/sntp/tests/run-packetProcessing.c
@@ -63,24 +63,24 @@ int main(int argc, char *argv[])
   progname = argv[0];
   Unity.TestFile = "packetProcessing.c";
   UnityBegin("packetProcessing.c");
-  RUN_TEST(test_TooShortLength, 76);
-  RUN_TEST(test_LengthNotMultipleOfFour, 85);
-  RUN_TEST(test_TooShortExtensionFieldLength, 94);
-  RUN_TEST(test_UnauthenticatedPacketReject, 110);
-  //RUN_TEST(test_CryptoNAKPacketReject, 123);
-  RUN_TEST(test_AuthenticatedPacketInvalid, 135);
-  RUN_TEST(test_AuthenticatedPacketUnknownKey, 158);
-  RUN_TEST(test_ServerVersionTooOld, 178);
-  RUN_TEST(test_ServerVersionTooNew, 193);
-  RUN_TEST(test_NonWantedMode, 208);
-  RUN_TEST(test_KoDRate, 223);
-  RUN_TEST(test_KoDDeny, 234);
-  RUN_TEST(test_RejectUnsyncedServer, 245);
-  RUN_TEST(test_RejectWrongResponseServerMode, 257);
-  RUN_TEST(test_AcceptNoSentPacketBroadcastMode, 274);
-  RUN_TEST(test_CorrectUnauthenticatedPacket, 286);
-  RUN_TEST(test_CorrectAuthenticatedPacketMD5, 294);
-  RUN_TEST(test_CorrectAuthenticatedPacketSHA1, 314);
+  RUN_TEST(test_TooShortLength, 81);
+  RUN_TEST(test_LengthNotMultipleOfFour, 90);
+  RUN_TEST(test_TooShortExtensionFieldLength, 99);
+  RUN_TEST(test_UnauthenticatedPacketReject, 115);
+  RUN_TEST(test_CryptoNAKPacketReject, 129);
+  RUN_TEST(test_AuthenticatedPacketInvalid, 142);
+  RUN_TEST(test_AuthenticatedPacketUnknownKey, 166);
+  RUN_TEST(test_ServerVersionTooOld, 186);
+  RUN_TEST(test_ServerVersionTooNew, 201);
+  RUN_TEST(test_NonWantedMode, 216);
+  RUN_TEST(test_KoDRate, 231);
+  RUN_TEST(test_KoDDeny, 242);
+  RUN_TEST(test_RejectUnsyncedServer, 253);
+  RUN_TEST(test_RejectWrongResponseServerMode, 265);
+  RUN_TEST(test_AcceptNoSentPacketBroadcastMode, 282);
+  RUN_TEST(test_CorrectUnauthenticatedPacket, 294);
+  RUN_TEST(test_CorrectAuthenticatedPacketMD5, 302);
+  RUN_TEST(test_CorrectAuthenticatedPacketSHA1, 322);
 
   return (UnityEnd());
 }
diff --git a/sntp/tests/sntptest.h b/sntp/tests/sntptest.h
index bb31f068e..eff6f6e99 100644
--- a/sntp/tests/sntptest.h
+++ b/sntp/tests/sntptest.h
@@ -1,8 +1,6 @@
 #ifndef SNTPTEST_H
 #define SNTPTEST_H
 
-//#include "tests_main.h"
-
 #include "ntp_stdlib.h"
 #include "sntp-opts.h"
 
@@ -10,12 +8,13 @@
 sntptest() {
 	optionSaveState(&sntpOptions);
 }
-/*
-~sntptest() {
+
+sntptest_destroy() {
 	optionRestore(&sntpOptions);
 }
-*/
+
 void ActivateOption(const char* option, const char* argument) {
+
 	const int ARGV_SIZE = 4;
 
 	char* opts[ARGV_SIZE];