X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=qaapi%2Fqa%2Ftests%2Fdelete_test_data.py;h=ee92ae2401e916cd863a06edd0a70b80898eefea;hb=78cccac717138edbe5ec2d915f06876ba1090108;hp=389fadea96a3c84081c0348c14d0ef65508d3198;hpb=fdc8831393e0ac743b9583ba27de888b5842964f;p=tests.git

diff --git a/qaapi/qa/tests/delete_test_data.py b/qaapi/qa/tests/delete_test_data.py
index 389fade..ee92ae2 100644
--- a/qaapi/qa/tests/delete_test_data.py
+++ b/qaapi/qa/tests/delete_test_data.py
@@ -25,6 +25,7 @@ class delete_test_data(Test):
                                   object['plc'] == None
 
 	sitelist = filter(this_plc, self.config.sites.values())
+	nodegrouplist = filter(this_plc, self.config.nodegroups.values())
 		
 	# Deleting the site should delete everything associated with it
 	# including nodes, persons
@@ -32,10 +33,19 @@ class delete_test_data(Test):
 	    try:
 	        api.DeleteSite(auth, site['login_base'])
 	        if self.config.verbose:
-	            utils.header("Test data deleted")
+	            utils.header("Test data deleted", logfile = self.config.logfile)
 	    except:
 		if self.config.verbose:
-		    utils.header("Error	deleting %s" % site['login_base'])		
+		    utils.header("Error	deleting %s" % site['login_base'], logfile = self.config.logfile)		
+	# Delete nodegroups
+	for nodegroup in nodegrouplist:
+	    try:
+		api.DeleteNodeGroup(auth, nodegroup['name'])
+		if self.config.verbose:
+		    utils.header("NodeGroups deleted", logfile = self.config.logfile)
+	    except:
+		if self.config.verbose:
+		    utils.header("Error deleting %s" % nodegroup['name'], logfile = self.config.logfile)	
 	return 1 
 	
 if __name__ == '__main__':