fix tests 4 --filter=[core]

Author: matyhtf

core-tests/src/core/base.cpp

@@ -369,14 +369,30 @@ TEST(base, spinlock) {
 }
 
 TEST(base, futex) {
-    sw_atomic_t value = 0;
+    sw_atomic_t value = 1;
 
-    std::thread t1([&value]{
-        ASSERT_EQ(sw_atomic_futex_wait(&value, 0.05), SW_ERR);
-        ASSERT_EQ(sw_atomic_futex_wait(&value, 0.5), SW_OK);
+    std::thread t1([&value] {
+        DEBUG() << "wait 1\n";
+        ASSERT_EQ(sw_atomic_futex_wait(&value, -1), SW_OK);        // no wait
+        value = 0;
+
+        DEBUG() << "wait 2\n";
+
+        ASSERT_EQ(sw_atomic_futex_wait(&value, 0.05), SW_ERR); // timed out
+        ASSERT_EQ(sw_atomic_futex_wait(&value, 0.5), SW_OK); // success
+
+        DEBUG() << "wait 3\n";
+
+        value = 0;
+        ASSERT_EQ(sw_atomic_futex_wait(&value, -1), SW_OK); // no timeout
     });
 
-    std::thread t2([&value]{
+    std::thread t2([&value] {
+        usleep(100000);
+        DEBUG() << "wakeup 1\n";
+        ASSERT_EQ(sw_atomic_futex_wakeup(&value, 1), 1);
+
+        DEBUG() << "wakeup 2\n";
         usleep(100000);
         ASSERT_EQ(sw_atomic_futex_wakeup(&value, 1), 1);
     });

core-tests/src/core/log.cpp

@@ -15,18 +15,39 @@ TEST(log, level) {
     for (auto iter = processTypes.begin(); iter != processTypes.end(); iter++) {
         swoole_set_worker_type(*iter);
         sw_logger()->reset();
+
+        ASSERT_FALSE(sw_logger()->is_opened());
+
+        sw_logger()->set_level(999);
+        ASSERT_EQ(sw_logger()->get_level(), SW_LOG_NONE);
+
+        sw_logger()->set_level(SW_LOG_DEBUG - 10);
+         ASSERT_EQ(sw_logger()->get_level(), SW_LOG_DEBUG);
+
         sw_logger()->set_level(SW_LOG_NOTICE);
         sw_logger()->open(file);
 
+        ASSERT_TRUE(sw_logger()->is_opened());
+
+        sw_logger()->put(SW_LOG_DEBUG, SW_STRL("hello no debug"));
+        sw_logger()->put(SW_LOG_TRACE, SW_STRL("hello no trace"));
         sw_logger()->put(SW_LOG_INFO, SW_STRL("hello info"));
         sw_logger()->put(SW_LOG_NOTICE, SW_STRL("hello notice"));
         sw_logger()->put(SW_LOG_WARNING, SW_STRL("hello warning"));
 
+        sw_logger()->set_level(SW_LOG_DEBUG);
+        sw_logger()->put(SW_LOG_DEBUG, SW_STRL("hello debug"));
+        sw_logger()->put(SW_LOG_TRACE, SW_STRL("hello trace"));
+
         auto content = file_get_contents(file);
 
         sw_logger()->close();
         unlink(file);
 
+        ASSERT_FALSE(content->contains(SW_STRL("hello no debug")));
+        ASSERT_FALSE(content->contains(SW_STRL("hello no trace")));
+        ASSERT_TRUE(content->contains(SW_STRL("hello debug")));
+        ASSERT_TRUE(content->contains(SW_STRL("hello trace")));
         ASSERT_FALSE(content->contains(SW_STRL("hello info")));
         ASSERT_TRUE(content->contains(SW_STRL("hello notice")));
         ASSERT_TRUE(content->contains(SW_STRL("hello warning")));