From 6efd73ff92239de8ed1f0b0ac2e34624d8fc9fa4 Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Wed, 7 Mar 2018 21:23:49 +0100 Subject: Remove duplicate test, use tempnam instead of hardcoded path. Issue: #543 --- test/helper-pidfile.c | 3 ++- test/helper-test.c | 16 ---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/test/helper-pidfile.c b/test/helper-pidfile.c index 9a5470cd..6149e0c9 100644 --- a/test/helper-pidfile.c +++ b/test/helper-pidfile.c @@ -71,7 +71,7 @@ int main ( G_GNUC_UNUSED int argc, G_GNUC_UNUSED char ** argv ) // Tests basic functionality of writing it, locking, seeing if I can write same again // And close/reopen it again. { - const char *path = "/tmp/rofi-test.pid"; + char *path = tempnam(NULL, "rofi-pid"); TASSERT( create_pid_file ( NULL ) == -1 ); int fd = create_pid_file ( path ); TASSERT( fd >= 0 ); @@ -82,5 +82,6 @@ int main ( G_GNUC_UNUSED int argc, G_GNUC_UNUSED char ** argv ) fd = create_pid_file ( path ); TASSERT( fd >= 0 ); remove_pid_file ( fd ); + free ( path ); } } diff --git a/test/helper-test.c b/test/helper-test.c index 1ba581c8..ddafde63 100644 --- a/test/helper-test.c +++ b/test/helper-test.c @@ -137,22 +137,6 @@ int main ( int argc, char ** argv ) TASSERT ( g_utf8_collate ( str, "Valid utf8 until �( we continue here" ) == 0 ); g_free ( str ); } - // Pid test. - // Tests basic functionality of writing it, locking, seeing if I can write same again - // And close/reopen it again. - { - const char *path = "/tmp/rofi-test.pid"; - TASSERT ( create_pid_file ( NULL ) == -1 ); - int fd = create_pid_file ( path ); - TASSERT ( fd >= 0 ); - int fd2 = create_pid_file ( path ); - TASSERT ( fd2 < 0 ); - - remove_pid_file ( fd ); - fd = create_pid_file ( path ); - TASSERT ( fd >= 0 ); - remove_pid_file ( fd ); - } { TASSERT ( utf8_strncmp ( "aapno", "aap€",3) == 0 ); TASSERT ( utf8_strncmp ( "aapno", "aap€",4) != 0 ); -- cgit v1.2.3