1 files changed, 11 insertions, 17 deletions

diff --git a/shared/nm-utils/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h
index 26190a7460..99e33c826d 100644
--- a/shared/nm-utils/nm-test-utils.h
+++ b/shared/nm-utils/nm-test-utils.h
@@ -46,10 +46,9 @@
  *   and g_test_assert_expected_messages() will not fail.
  *
  * NMTST_SEED_RAND environment variable:
- *   Tests that use random numbers from nmtst_get_rand() get seeded at each start.
- *   You can specify the seed by setting NMTST_SEED_RAND to a particular number or empty ("")
- *   for a random one. If NMTST_SEED_RAND is not set (default) a stable seed gets chosen.
- *   Tests will print the seed to stdout, so that you know which one was chosen or generated.
+ *   Tests that use random numbers from nmtst_get_rand() get seeded randomly at each start.
+ *   You can specify the seed by setting NMTST_SEED_RAND. Also, tests will print the seed
+ *   to stdout, so that you know the chosen seed.
  *
  *
  * NMTST_DEBUG environment variable:
@@ -827,20 +826,10 @@ nmtst_get_rand (void)
 
 	if (G_UNLIKELY (!__nmtst_internal.rand)) {
 		guint32 seed;
-		const char *str = g_getenv ("NMTST_SEED_RAND");
+		const char *str;
 
-		if (!str) {
-			/* No NMTST_SEED_RAND. Pick a stable one. */
-			seed = 0;
-			__nmtst_internal.rand = g_rand_new_with_seed (seed);
-		} else if (str[0] == '\0') {
-			/* NMTST_SEED_RAND is set but empty. Pick a random one. */
-			__nmtst_internal.rand = g_rand_new ();
-
-			seed = g_rand_int (__nmtst_internal.rand);
-			g_rand_set_seed (__nmtst_internal.rand, seed);
-		} else {
-			/* NMTST_SEED_RAND is set. Use it as a seed. */
+		if (   (str = g_getenv ("NMTST_SEED_RAND"))
+		    && str[0] != '\0') {
 			char *s;
 			gint64 i;
 
@@ -849,6 +838,11 @@ nmtst_get_rand (void)
 
 			seed = i;
 			__nmtst_internal.rand = g_rand_new_with_seed (seed);
+		} else {
+			__nmtst_internal.rand = g_rand_new ();
+
+			seed = g_rand_int (__nmtst_internal.rand);
+			g_rand_set_seed (__nmtst_internal.rand, seed);
 		}
 		__nmtst_internal.rand_seed = seed;