X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FTest.py;h=486711943dc6b0e1e5feae7af0b7cd9142bc7b3b;hb=refs%2Fheads%2Fplanetlab-4_0-branch;hp=1610ed7fb4e6da9106013dce6039338505cefd27;hpb=f84cbfde8f99c04ad05322c7ac8392fc34b820bd;p=plcapi.git

diff --git a/PLC/Test.py b/PLC/Test.py
index 1610ed7..4867119 100644
--- a/PLC/Test.py
+++ b/PLC/Test.py
@@ -5,7 +5,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: Test.py,v 1.19 2007/01/09 16:23:47 mlhuang Exp $
+# $Id: Test.py 5574 2007-10-25 20:33:17Z thierry $
 #
 
 from pprint import pprint
@@ -371,7 +371,8 @@ class Test:
             # Update site
             site_fields = random_site()
             # Do not change login_base
-            del site_fields['login_base']
+	    if 'login_base' in site_fields:
+		del site_fields['login_base']
             self.api.UpdateSite(site_id, site_fields)
 
             if self.check:
@@ -605,6 +606,8 @@ class Test:
         for person_id in self.person_ids:
             # Update user
             person_fields = random_person()
+            # Keep them enabled
+            person_fields['enabled'] = True
             self.api.UpdatePerson(person_id, person_fields)
 
             if self.check:
@@ -1154,7 +1157,8 @@ class Test:
             # Update configuration file
             conf_file_fields = random_conf_file()
             # Do not update dest so that it remains an override if set
-            del conf_file_fields['dest']
+	    if 'dest' in conf_file_fields:
+		del conf_file_fields['dest']
             self.api.UpdateConfFile(conf_file_id, conf_file_fields)
 
             if self.check:
@@ -1306,7 +1310,8 @@ class Test:
             # Update slice
             slice_fields = random_slice("unused")
             # Cannot change slice name
-            del slice_fields['name']
+	    if 'name' in slice_fields:
+		del slice_fields['name']
             self.api.UpdateSlice(slice_id, slice_fields)
 
             slice = self.api.GetSlices([slice_id])[0]