From: Matt Benjamin <mbenjamin@redhat.com>
Date: Fri, 8 Jan 2016 19:39:50 +0000 (-0500)
Subject: librgw: reorg SETUP_ENUMERATE test
X-Git-Tag: v10.1.0~382^2~55
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b008fe52049a2dbeaad8796094895277b4db3002;p=ceph.git

librgw: reorg SETUP_ENUMERATE test

Stat nfsroot bucket, create it only if !exist && do_create.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
---

diff --git a/src/test/librgw_file_nfsns.cc b/src/test/librgw_file_nfsns.cc
index e91e452af292..8e90dba80f19 100644
--- a/src/test/librgw_file_nfsns.cc
+++ b/src/test/librgw_file_nfsns.cc
@@ -123,7 +123,21 @@ TEST(LibRGW, MOUNT) {
 
 TEST(LibRGW, SETUP_ENUMERATE1)
 {
-  if (do_create) {
+
+  (void) rgw_lookup(fs, fs->root_fh, bucket_name.c_str(), &bucket_fh,
+		    RGW_LOOKUP_FLAG_NONE);
+  if (! bucket_fh) {
+    if (do_create) {
+      struct stat st;
+      int rc = rgw_mkdir(fs, fs->root_fh, bucket_name.c_str(), 755, &st,
+			 &bucket_fh);
+      ASSERT_EQ(rc, 0);
+    }
+  }
+
+  ASSERT_NE(bucket_fh, nullptr);
+  
+  if (do_create) {    
     /* create objects directly */
     std::vector<std::string> obj_names =
       {"foo/bar/baz/quux",
@@ -260,17 +274,6 @@ TEST(LibRGW, MARKER1_SETUP_BUCKET)
     struct stat st;
     int ret;
 
-    if (do_create) {
-      ret = rgw_mkdir(fs, fs->root_fh, bucket_name.c_str(), 755, &st,
-		      &bucket_fh);
-    }
-    if (! bucket_fh) {
-      ret = rgw_lookup(fs, fs->root_fh, bucket_name.c_str(), &bucket_fh,
-		       RGW_LOOKUP_FLAG_NONE);
-      ASSERT_EQ(ret, 0);
-    }
-    ASSERT_NE(bucket_fh, nullptr);
-
     if (do_create) {
       ret = rgw_mkdir(fs, bucket_fh, marker_dir.c_str(), 755, &st, &marker_fh);
     } else {