[fix] Fix import and rearrange C++ unit test assertions

oils-for-unix · Nov 18, 2021 · 7143c7a · 7143c7a
1 parent 21a4de7
commit 7143c7a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cpp/unit_tests.cc b/cpp/unit_tests.cc
@@ -365,16 +365,16 @@ TEST pyos_test() {
   }
 
   Tuple2<int, int> tup = pyos::ReadByte(fd);
+  ASSERT_EQ_FMT(0, tup.at1(), "%d");  // error code
   ASSERT_EQ_FMT('S', tup.at0(), "%d");
-  ASSERT_EQ_FMT(0, tup.at1(), "%d");
 
   tup = pyos::ReadByte(fd);
+  ASSERT_EQ_FMT(0, tup.at1(), "%d");  // error code
   ASSERT_EQ_FMT('H', tup.at0(), "%d");
-  ASSERT_EQ_FMT(0, tup.at1(), "%d");
 
   tup = pyos::ReadByte(fd);
+  ASSERT_EQ_FMT(0, tup.at1(), "%d");  // error code
   ASSERT_EQ_FMT(pyos::EOF_SENTINEL, tup.at0(), "%d");
-  ASSERT_EQ_FMT(0, tup.at1(), "%d");
 
   close(fd);
 

diff --git a/osh/bool_stat.py b/osh/bool_stat.py
@@ -8,7 +8,7 @@
 
 import stat
 import posix_ as posix
-from posix import X_OK, R_OK, W_OK  # refers directly to C macro
+from posix_ import X_OK, R_OK, W_OK  # refers directly to C macro
 from _devbuild.gen.id_kind_asdl import Id, Id_t
 from _devbuild.gen.syntax_asdl import word_t
 from core.pyerror import e_die