[Openvas-commits] r5635 - in trunk/openvas-manager: . src/tests

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2009-10-20 00:25:34 +0200 (Tue, 20 Oct 2009)
New Revision: 5635

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/tests/omp_get_preferences_0.c
Log:
	* src/tests/omp_get_preferences_0.c: Expect success always, now that the
	manager only loads if the preferences are cached.

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2009-10-19 22:18:01 UTC (rev 5634)
+++ trunk/openvas-manager/ChangeLog	2009-10-19 22:25:34 UTC (rev 5635)
@@ -1,5 +1,10 @@
 2009-10-19  Matthew Mundell <matthew.mundell at intevation.de>
 
+	* src/tests/omp_get_preferences_0.c: Expect success always, now that the
+	manager only loads if the preferences are cached.
+
+2009-10-19  Matthew Mundell <matthew.mundell at intevation.de>
+
 	* src/tests/omp_start_task_0.c: Also expect REPORT_ID in response.
 
 2009-10-19  Matthew Mundell <matthew.mundell at intevation.de>

Modified: trunk/openvas-manager/src/tests/omp_get_preferences_0.c
===================================================================
--- trunk/openvas-manager/src/tests/omp_get_preferences_0.c	2009-10-19 22:18:01 UTC (rev 5634)
+++ trunk/openvas-manager/src/tests/omp_get_preferences_0.c	2009-10-19 22:25:34 UTC (rev 5635)
@@ -66,19 +66,17 @@
 
   /* Compare to expected response. */
 
-  entity_t expected = add_entity (NULL, "get_preferences_response", NULL);
-  add_attribute (expected, "status", "503");
-  add_attribute (expected, "status_text", "Service temporarily down");
-
-  if (compare_entities (entity, expected))
+  if (strcmp (entity_name (entity), "get_preferences_response")
+      || (entity_attribute (entity, "status") == NULL)
+      || strcmp (entity_attribute (entity, "status"), "200")
+      || (entity_attribute (entity, "status_text") == NULL)
+      || strcmp (entity_attribute (entity, "status_text"), "OK"))
     {
       free_entity (entity);
-      free_entity (expected);
       close_manager_connection (socket, session);
       return EXIT_FAILURE;
     }
 
-  free_entity (expected);
   free_entity (entity);
   close_manager_connection (socket, session);
   return EXIT_SUCCESS;