From db144840aba95affb3a6b5b2536059f49f0677ff Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Thu, 17 Feb 2011 11:00:14 +0000
Subject: Rewrite of all old tests to new unittest framework. Also some work on
 testdb; more to come...

---
 server/src/httpd.cc | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'server/src/httpd.cc')

diff --git a/server/src/httpd.cc b/server/src/httpd.cc
index f0abbb5..1d121b5 100644
--- a/server/src/httpd.cc
+++ b/server/src/httpd.cc
@@ -239,8 +239,8 @@ bool Httpd::is_running_ssl()
 }
 
 #ifdef TEST_HTTPD
-//deps:
-//cflags: $(HTTPD_CFLAGS)
+//deps: debug.cc log.cc
+//cflags: -I.. $(HTTPD_CFLAGS)
 //libs: $(HTTPD_LIBS) -lcurl
 #include "test.h"
 
@@ -314,6 +314,7 @@ public:
   }
 };
 
+#if 0
 static size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp)
 {
   std::string *str = (std::string*)userp;
@@ -324,6 +325,8 @@ static size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp)
 static std::string send(const std::string &msg, std::string name,
                         std::string value, CURLcode *ret)
 {
+  std::string response;
+
   CURL *c = curl_easy_init();
   curl_easy_setopt(c, CURLOPT_URL, "localhost");
   curl_easy_setopt(c, CURLOPT_PORT, PORT);
@@ -338,16 +341,15 @@ static std::string send(const std::string &msg, std::string name,
   curl_easy_setopt(c, CURLOPT_POSTFIELDS, msg.data());
   curl_easy_setopt(c, CURLOPT_POST, 1L);
 
-  std::string response;
   curl_easy_setopt(c, CURLOPT_WRITEFUNCTION, write_data);
   curl_easy_setopt(c, CURLOPT_WRITEDATA, &response);
-  
+
   struct curl_slist *slist=NULL;
   slist = curl_slist_append(slist, (name + ": " + value).c_str());
   slist = curl_slist_append(slist, "Content-Type: application/octet-stream");
 
   curl_easy_setopt(c, CURLOPT_HTTPHEADER, slist);
-  
+    
   *ret = curl_easy_perform(c);
   
   curl_slist_free_all(slist);
@@ -355,13 +357,14 @@ static std::string send(const std::string &msg, std::string name,
 
   return response;
 }
+#endif/*0*/
 
 TEST_BEGIN;
 
 TestHttpd httpd;
 httpd.listen(PORT);
 TEST_TRUE(httpd.is_running(), "Is the server running?");
-
+/*
 std::string r;
 
 CURLcode errornum;
@@ -374,7 +377,7 @@ msg.append(LONG_LEN, 0x00);
 r = send(msg, "foo", "bar", &errornum);
 TEST_EQUAL_INT(errornum, CURLE_OK, "Did perfom go well?");
 TEST_EQUAL(r, msg, "Did we receive the correct answer?");
-
+*/
 TEST_END;
 
 #endif/*TEST_HTTPD*/
-- 
cgit v1.2.3