(src|tests)/datasource/tty*: adjust the unknown tty handling

Reason: A bunch of tests have been failing because of this.
a2o · Apr 10, 2018 · 3fb5916 · 3fb5916
1 parent db99607
commit 3fb5916
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 3 deletions.
diff --git a/src/datasource/tty.c b/src/datasource/tty.c
@@ -65,7 +65,7 @@ int snoopy_datasource_tty (char * const result, char const * const arg)
         if (ENOTTY == retVal) {
             return snprintf(result, SNOOPY_DATASOURCE_MESSAGE_MAX_SIZE, "(none)");
         }
-        return snprintf(result, SNOOPY_DATASOURCE_MESSAGE_MAX_SIZE, "ERROR(ttyname_r->EUNKNOWN)");
+        return snprintf(result, SNOOPY_DATASOURCE_MESSAGE_MAX_SIZE, "(unknown)");
     }
 
     return snprintf(result, SNOOPY_DATASOURCE_MESSAGE_MAX_SIZE, "%s", ttyPath);

diff --git a/src/datasource/tty_uid.c b/src/datasource/tty_uid.c
@@ -72,7 +72,7 @@ int snoopy_datasource_tty_uid (char * const result, char const * const arg)
         if (ENOTTY == retVal) {
             return snprintf(result, SNOOPY_DATASOURCE_MESSAGE_MAX_SIZE, "(none)");
         }
-        return snprintf(result, SNOOPY_DATASOURCE_MESSAGE_MAX_SIZE, "ERROR(ttyname_r->EUNKNOWN)");
+        return snprintf(result, SNOOPY_DATASOURCE_MESSAGE_MAX_SIZE, "(unknown)");
     }
 
     /* Get owner of tty */

diff --git a/src/datasource/tty_username.c b/src/datasource/tty_username.c
@@ -82,7 +82,7 @@ int snoopy_datasource_tty_username (char * const result, char const * const arg)
         if (ENOTTY == retVal) {
             return snprintf(result, SNOOPY_DATASOURCE_MESSAGE_MAX_SIZE, "(none)");
         }
-        return snprintf(result, SNOOPY_DATASOURCE_MESSAGE_MAX_SIZE, "ERROR(ttyname_r->EUNKNOWN)");
+        return snprintf(result, SNOOPY_DATASOURCE_MESSAGE_MAX_SIZE, "(unknown)");
     }
 
 

diff --git a/tests/datasource/datasource_tty.sh b/tests/datasource/datasource_tty.sh
@@ -13,6 +13,10 @@ set -u
 ### Get data
 #
 VAL_SNOOPY=`$SNOOPY_TEST_DATASOURCE tty`
+if [ "(unknown)" == "$VAL_SNOOPY" ]; then
+    VAL_SNOOPY="(none)"
+fi
+
 if ! tty -s; then
     VAL_REAL="(none)"
 else

diff --git a/tests/datasource/datasource_tty_uid.sh b/tests/datasource/datasource_tty_uid.sh
@@ -13,6 +13,10 @@ set -u
 ### Get data
 #
 VAL_SNOOPY=`$SNOOPY_TEST_DATASOURCE tty_uid`
+if [ "(unknown)" == "$VAL_SNOOPY" ]; then
+    VAL_SNOOPY="(none)"
+fi
+
 if ! tty -s; then
     VAL_REAL="(none)"
 else

diff --git a/tests/datasource/datasource_tty_username.sh b/tests/datasource/datasource_tty_username.sh
@@ -13,6 +13,10 @@ set -u
 ### Get data
 #
 VAL_SNOOPY=`$SNOOPY_TEST_DATASOURCE tty_username`
+if [ "(unknown)" == "$VAL_SNOOPY" ]; then
+    VAL_SNOOPY="(none)"
+fi
+
 if ! tty -s; then
     VAL_REAL="(none)"
 else