locking: Change locking order, move NAL after instances

[ganeti-local] / test / import-export_unittest-helper

diff --git a/test/import-export_unittest-helper b/test/import-export_unittest-helper
index 0f465a1..7d1ee96 100755 (executable)
--- a/test/import-export_unittest-helper
+++ b/test/import-export_unittest-helper
@@ -32,8 +32,8 @@ from ganeti import objects
 from ganeti import serializer
 
 
-RETRY_INTERVAL = 0.1
-TIMEOUT = int(os.getenv("TIMEOUT", 10))
+RETRY_INTERVAL = (0.1, 1.1, 1)
+TIMEOUT = int(os.getenv("TIMEOUT", 30))
 VALIDITY = int(os.getenv("VALIDITY", 1))