Move https.* to http.*

7 files changed, 3 insertions, 38 deletions

diff --git a/Makefile b/Makefile
index 20b1072..fe2f7a0 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,6 @@ PROGSRC=\
     config.cpp \
     error.cpp \
     http.cpp \
-    https.cpp \
     plugin.cpp \
     privileges.cpp \
     response.cpp \
@@ -155,8 +154,6 @@ DISTFILES= \
 	error.h \
 	http.cpp \
 	http.h \
-	https.cpp \
-	https.h \
 	install-webserver.sh \
 	main.cpp \
 	plugin.cpp \
@@ -215,7 +212,6 @@ DISTFILES= \
 	tests/test-config.cpp \
 	tests/test-environment.cpp \
 	tests/test-http.cpp \
-	tests/test-https.cpp \
 	tests/test-plugin.cpp \
 	tests/test-privileges.cpp \
 	tests/test-response.cpp \
diff --git a/https.cpp b/http.cpp
index 20fab61..868e739 100644
--- a/https.cpp
+++ b/http.cpp
@@ -1,4 +1,4 @@
-#include "https.h"
+#include "http.h"
 
 #include "config.h"
 #include "error.h"
diff --git a/https.h b/http.h
index 226490e..226490e 100644
--- a/https.h
+++ b/http.h
diff --git a/server.cpp b/server.cpp
index 3f6183b..26b4292 100644
--- a/server.cpp
+++ b/server.cpp
@@ -22,7 +22,6 @@
 #include "server.h"
 
 #include "http.h"
-#include "https.h"
 #include "privileges.h"
 #include "statistics.h"
 
diff --git a/tests/Makefile b/tests/Makefile
index 14af291..c04cbcd 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -38,7 +38,6 @@ UNITS=\
     config.cpp \
     error.cpp \
     http.cpp \
-    https.cpp \
     plugin.cpp \
     privileges.cpp \
     response.cpp \
@@ -52,7 +51,6 @@ TESTSRC=\
     test-config.cpp \
     test-environment.cpp \
     test-http.cpp \
-    test-https.cpp \
     test-plugin.cpp \
     test-privileges.cpp \
     test-response.cpp \
@@ -91,8 +89,6 @@ error.o: ../error.cpp
 	$(CXX) $(CXXFLAGS) $(CXXTESTFLAGS) -c $< -o $@
 http.o: ../http.cpp
 	$(CXX) $(CXXFLAGS) $(CXXTESTFLAGS) -c $< -o $@
-https.o: ../https.cpp
-	$(CXX) $(CXXFLAGS) $(CXXTESTFLAGS) -c $< -o $@
 plugin.o: ../plugin.cpp
 	$(CXX) $(CXXFLAGS) $(CXXTESTFLAGS) -c $< -o $@
 privileges.o: ../privileges.cpp
diff --git a/tests/test-https.cpp b/tests/test-https.cpp
deleted file mode 100644
index cb917e9..0000000
--- a/tests/test-https.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <boost/test/unit_test.hpp>
-#include <boost/test/data/dataset.hpp>
-#include <boost/test/data/monomorphic.hpp>
-#include <boost/test/data/test_case.hpp>
-
-#include <boost/property_tree/ptree.hpp>
-#include <boost/property_tree/xml_parser.hpp>
-
-#include <sstream>
-#include <string>
-
-#include "https.h"
-
-using namespace std::string_literals;
-
-class HTTPSFixture
-{
-public:
- HTTPSFixture(){}
- ~HTTPSFixture(){}
- void setup(){}
- void teardown(){}
-};
-
-BOOST_FIXTURE_TEST_CASE(https, HTTPSFixture)
-{
-}
-
diff --git a/tests/test-webserver.cpp b/tests/test-webserver.cpp
index 727356d..85859df 100644
--- a/tests/test-webserver.cpp
+++ b/tests/test-webserver.cpp
@@ -1113,6 +1113,7 @@ echo -ne "HTTP_HOST: $HTTP_HOST\r\n"
 BOOST_FIXTURE_TEST_CASE(empty_config, Fixture)
 {
  WebserverProcess serverProcess{""};
+ std::this_thread::sleep_for(std::chrono::milliseconds(50));
  BOOST_REQUIRE_EQUAL(serverProcess.is_running(), false);
 }
 
@@ -1123,5 +1124,6 @@ BOOST_FIXTURE_TEST_CASE(incomplete_config, Fixture)
  <group>www-data</group>
 </webserver>)CONFIG"};
  WebserverProcess serverProcess{webserver_config};
+ std::this_thread::sleep_for(std::chrono::milliseconds(50));
  BOOST_REQUIRE_EQUAL(serverProcess.is_running(), false);
 }