fix

alibaba · Jun 1, 2024 · e75f23b · e75f23b
1 parent 436bbaf
commit e75f23b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 54 deletions.
diff --git a/common/executor/test/test_async.cpp b/common/executor/test/test_async.cpp
@@ -23,8 +23,8 @@ limitations under the License.
 #include <photon/fs/filesystem.h>
 #include <photon/fs/localfs.h>
 #include <photon/thread/thread.h>
-#include <pthread.h>
-#include <sched.h>
+// #include <pthread.h>
+// #include <sched.h>
 #include "../../../test/ci-tools.h"
 // #include <immintrin.h>
 

diff --git a/common/executor/test/test_export_as_executor.cpp b/common/executor/test/test_export_as_executor.cpp
@@ -4,8 +4,6 @@
 #include <photon/common/alog.h>
 #include <photon/photon.h>
 #include <photon/thread/thread.h>
-#include "../../../test/ci-tools.h"
-
 #include <thread>
 
 TEST(enter_as_executor, test) {

diff --git a/fs/exportfs.cpp b/fs/exportfs.cpp
@@ -561,6 +561,7 @@ namespace fs
         ExportBase::ref = 1;
         if (thread_pool_capacity != 0) ExportBase::pool = new_thread_pool(thread_pool_capacity);
         evloop->async_run();
+        LOG_INFO(" OK");
         return 0;
     }
     int exportfs_fini()

diff --git a/fs/test/test_exportfs.cpp b/fs/test/test_exportfs.cpp
@@ -35,17 +35,13 @@ using namespace photon;
 using namespace photon::fs;
 using namespace testing;
 
-// #ifdef __linux__
-// static const int event_engine = photon::INIT_EVENT_EPOLL;
-// #else
-// static const int event_engine = photon::INIT_EVENT_KQUEUE;
-// #endif
-
 inline void photon_init() {
-    init(INIT_EVENT_DEFAULT, INIT_IO_EXPORTFS);
+    init(INIT_EVENT_DEFAULT, INIT_IO_NONE);
+    exportfs_init();
 }
 
 inline void photon_fini() {
+    exportfs_fini();
     fini();
 }
 
@@ -108,14 +104,6 @@ int callbackvoid(void*, AsyncResult<void>* ret) {
     }
 
 TEST(ExportFS, basic) {
-    // photon::vcpu_init();
-    // photon::fd_events_init(event_engine);
-    // exportfs_init();
-    // DEFER({
-    //     exportfs_fini();
-    //     photon::fd_events_fini();
-    //     photon::vcpu_fini();
-    // });
     PMock::MockNullFile* mockfile = new PMock::MockNullFile();
     PMock::MockNullFileSystem* mockfs = new PMock::MockNullFileSystem();
     PMock::MockNullDIR* mockdir = new PMock::MockNullDIR();
@@ -266,10 +254,6 @@ TEST(ExportFS, init_fini_failed_situation) {
     DEFER({
         log_output = _o_output;
     });
-    // photon::vcpu_init();
-    // photon::fd_events_init(event_engine);
-    // ret = exportfs_init();
-    // EXPECT_EQ(0, ret);
 
     auto ret = exportfs_init();
     EXPECT_EQ(-1, ret);
@@ -283,8 +267,6 @@ TEST(ExportFS, init_fini_failed_situation) {
 
     ret = exportfs_init();
     EXPECT_EQ(0, ret);
-    // photon::fd_events_fini();
-    // photon::vcpu_fini();
 }
 
 TEST(ExportFS, op_failed_situation) {
@@ -293,14 +275,6 @@ TEST(ExportFS, op_failed_situation) {
     DEFER({
         log_output = _o_output;
     });
-    // photon::vcpu_init();
-    // photon::fd_events_init(event_engine);
-    // exportfs_init();
-    // DEFER({
-    //     exportfs_fini();
-    //     photon::fd_events_fini();
-    //     // photon::vcpu_fini();
-    // });
     PMock::MockNullFile* mockfile = new PMock::MockNullFile;
     errno = 0;
     EXPECT_CALL(*mockfile, read(_, _))
@@ -322,14 +296,6 @@ TEST(ExportFS, op_failed_situation) {
 }
 
 TEST(ExportFS, xattr) {
-    // photon::vcpu_init();
-    // photon::fd_events_init(event_engine);
-    // exportfs_init();
-    // DEFER({
-    //     exportfs_fini();
-    //     photon::fd_events_fini();
-    //     photon::vcpu_fini();
-    // });
     PMock::MockNullFile* mockfile = new PMock::MockNullFile();
     PMock::MockNullFileSystem* mockfs = new PMock::MockNullFileSystem();
     auto file = dynamic_cast<IAsyncFileXAttr*>(export_as_async_file(mockfile));
@@ -392,14 +358,6 @@ TEST(ExportFS, xattr_sync) {
     std::thread th([&]{
         photon_init();
         DEFER(photon_fini());
-        // photon::vcpu_init();
-        // photon::fd_events_init(event_engine);
-        // exportfs_init();
-        // DEFER({
-        //     exportfs_fini();
-        //     photon::fd_events_fini();
-        //     photon::vcpu_fini();
-        // });
         file = dynamic_cast<IFileXAttr*>(export_as_sync_file(mockfile));
         fs = dynamic_cast<IFileSystemXAttr*>(export_as_sync_fs(mockfs));
         sem.wait(1);
@@ -448,9 +406,8 @@ int main(int argc, char **argv)
 {
     photon_init();
     DEFER(photon_fini());
-    return 0;
-    // ::testing::InitGoogleTest(&argc, argv);
-    // int ret = RUN_ALL_TESTS();
-    // LOG_ERROR_RETURN(0, ret, VALUE(ret));
-    // return ret;
+    ::testing::InitGoogleTest(&argc, argv);
+    int ret = RUN_ALL_TESTS();
+    LOG_ERROR_RETURN(0, ret, VALUE(ret));
+    return ret;
 }