s/stage/prepare

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

diff --git a/ragweed/framework.py b/ragweed/framework.py
index 381098e43b00fb7569be884a09390eafb6c83e7a..02aac8b7f0bd7e0b6c4fd741b216954fa3a547e1 100644 (file)
--- a/ragweed/framework.py
+++ b/ragweed/framework.py
@@ -85,11 +85,11 @@ class RSuite:
         self.zone = zone
         self.config_bucket = None
         self.rtests = []
-        self.do_staging = False
+        self.do_preparing = False
         self.do_check = False
         for step in suite_step.split(','):
-            if step == 'stage' or step == 'staging':
-                self.do_staging = True
+            if step == 'prepare':
+                self.do_preparing = True
                 self.config_bucket = self.zone.create_raw_bucket(self.get_bucket_name('conf'))
             if step == 'check' or step == 'test':
                 self.do_check = True
@@ -112,8 +112,8 @@ class RSuite:
         s = k.get_contents_as_string()
         test.from_json(s)
 
-    def is_staging(self):
-        return self.do_staging
+    def is_preparing(self):
+        return self.do_preparing
 
     def is_checking(self):
         return self.do_check
@@ -239,7 +239,7 @@ class RTest:
     def init(self):
         pass
 
-    def stage(self):
+    def prepare(self):
         pass
 
     def check(self):
@@ -268,8 +268,8 @@ class RTest:
 
     def test(self):
         suite.register_test(self)
-        if suite.is_staging():
-            self.stage()
+        if suite.is_preparing():
+            self.prepare()
             self.save()
 
         if suite.is_checking():
@@ -368,7 +368,7 @@ class RagweedEnv:
             conn[k] = RGWConnection(u.access_key, u.secret_key, rgw_conf.host, dict_find(rgw_conf, 'port'), dict_find(rgw_conf, 'is_secure'))
 
         self.zone = RZone(conn)
-        self.suite = RSuite('ragweed', self.bucket_prefix, self.zone, os.environ['RAGWEED_RUN'])
+        self.suite = RSuite('ragweed', self.bucket_prefix, self.zone, os.environ['RAGWEED_STAGES'])
 
         try:
             self.ceph_conf = self.config.rados.ceph_conf

diff --git a/ragweed/tests/tests.py b/ragweed/tests/tests.py
index 6bb1dab5edf8a19f5302a9ddad475236a3af6e38..c37a41a82086dd0e1b72ee3471afa9786a2ce4bc 100644 (file)
--- a/ragweed/tests/tests.py
+++ b/ragweed/tests/tests.py
@@ -83,13 +83,13 @@ def validate_obj(rbucket, obj_name, expected_crc):
 def gen_rand_string(size, chars=string.ascii_uppercase + string.digits):
     return ''.join(random.choice(chars) for _ in range(size))
 
-# stage:
+# prepare:
 # create objects in multiple sizes, with various names
 # check:
 # verify data correctness
 # verify that objects were written to the expected data pool
 class r_test_small_obj_data(RTest):
-    def stage(self):
+    def prepare(self):
         self.r_obj_names = [ 'obj', '_', '__', '_ _' ]
         self.r_bucket_sizes = {}
 
@@ -189,7 +189,7 @@ class MultipartUploader:
 
 
 
-# stage:
+# prepare:
 # init, upload, and complete a multipart object
 # check:
 # verify data correctness
@@ -199,7 +199,7 @@ class r_test_multipart_simple(RTest):
         self.obj_size = 18 * 1024 * 1024
         self.part_size = 5 * 1024 * 1024
 
-    def stage(self):
+    def prepare(self):
         rb = self.create_bucket()
         self.r_obj = 'foo'
 
@@ -222,7 +222,7 @@ class r_test_multipart_simple(RTest):
         validate_obj(rb, self.r_obj, self.r_crc)
 
 
-# stage:
+# prepare:
 # init, upload multipart object
 # check:
 # complete multipart
@@ -233,7 +233,7 @@ class r_test_multipart_defer_complete(RTest):
         self.obj_size = 18 * 1024 * 1024
         self.part_size = 5 * 1024 * 1024
 
-    def stage(self):
+    def prepare(self):
         rb = self.create_bucket()
         self.r_obj = 'foo'
 
@@ -262,7 +262,7 @@ class r_test_multipart_defer_complete(RTest):
         validate_obj(rb, self.r_obj, crc)
 
 
-# stage:
+# prepare:
 # init, upload multipart object
 # check:
 # complete multipart
@@ -273,7 +273,7 @@ class r_test_multipart_defer_update_complete(RTest):
         self.obj_size = 18 * 1024 * 1024
         self.part_size = 5 * 1024 * 1024
 
-    def stage(self):
+    def prepare(self):
         rb = self.create_bucket()
         self.r_obj = 'foo'