[pkg-fso-commits] [SCM] Automatic Display Manager branch, master, updated. debian/0.8-1-15-g1e42ea5

[Enrico Zini]

The following commit has been merged in the master branch:
commit 1e42ea5b6ad1cd5acc4b38aea2fc5b7c9052081d
Author: Enrico Zini <enrico at enricozini.org>
Date:   Sat Jul 9 10:39:21 2011 +0200

    Updated tests to account for '-nolisten tcp' injection

diff --git a/test-internals.c b/test-internals.c
index 59a3c26..5dd936c 100644
--- a/test-internals.c
+++ b/test-internals.c
@@ -42,7 +42,9 @@ int main(int argc, char* argv[])
     nodm_display_manager_parse_xcmdline(&s, "");
     ensure_equals(s.srv.argv[0], "/usr/bin/X");
     ensure_equals(s.srv.argv[1], ":0");
-    ensure_equals(s.srv.argv[2], NULL);
+    ensure_equals(s.srv.argv[2], "-nolisten");
+    ensure_equals(s.srv.argv[3], "tcp");
+    ensure_equals(s.srv.argv[4], NULL);
     ensure_equals(s.srv.name, ":0");
     ensure_equali(s.vt.conf_initial_vt, 7);
     nodm_display_manager_cleanup(&s);
@@ -52,7 +54,9 @@ int main(int argc, char* argv[])
     ensure_equals(s.srv.argv[0], "/usr/bin/X");
     ensure_equals(s.srv.argv[1], ":0");
     ensure_equals(s.srv.argv[2], "foo");
-    ensure_equals(s.srv.argv[3], NULL);
+    ensure_equals(s.srv.argv[3], "-nolisten");
+    ensure_equals(s.srv.argv[4], "tcp");
+    ensure_equals(s.srv.argv[5], NULL);
     ensure_equals(s.srv.name, ":0");
     ensure_equali(s.vt.conf_initial_vt, 7);
     nodm_display_manager_cleanup(&s);
@@ -61,7 +65,9 @@ int main(int argc, char* argv[])
     nodm_display_manager_parse_xcmdline(&s, "/usr/bin/Xnest");
     ensure_equals(s.srv.argv[0], "/usr/bin/Xnest");
     ensure_equals(s.srv.argv[1], ":0");
-    ensure_equals(s.srv.argv[2], NULL);
+    ensure_equals(s.srv.argv[2], "-nolisten");
+    ensure_equals(s.srv.argv[3], "tcp");
+    ensure_equals(s.srv.argv[4], NULL);
     ensure_equals(s.srv.name, ":0");
     ensure_equali(s.vt.conf_initial_vt, 7);
     nodm_display_manager_cleanup(&s);
@@ -70,7 +76,9 @@ int main(int argc, char* argv[])
     nodm_display_manager_parse_xcmdline(&s, ":1");
     ensure_equals(s.srv.argv[0], "/usr/bin/X");
     ensure_equals(s.srv.argv[1], ":1");
-    ensure_equals(s.srv.argv[2], NULL);
+    ensure_equals(s.srv.argv[2], "-nolisten");
+    ensure_equals(s.srv.argv[3], "tcp");
+    ensure_equals(s.srv.argv[4], NULL);
     ensure_equals(s.srv.name, ":1");
     ensure_equali(s.vt.conf_initial_vt, 7);
     nodm_display_manager_cleanup(&s);
@@ -79,7 +87,9 @@ int main(int argc, char* argv[])
     nodm_display_manager_parse_xcmdline(&s, "/usr/bin/Xnest :1");
     ensure_equals(s.srv.argv[0], "/usr/bin/Xnest");
     ensure_equals(s.srv.argv[1], ":1");
-    ensure_equals(s.srv.argv[2], NULL);
+    ensure_equals(s.srv.argv[2], "-nolisten");
+    ensure_equals(s.srv.argv[3], "tcp");
+    ensure_equals(s.srv.argv[4], NULL);
     ensure_equals(s.srv.name, ":1");
     ensure_equali(s.vt.conf_initial_vt, 7);
     nodm_display_manager_cleanup(&s);
@@ -89,7 +99,9 @@ int main(int argc, char* argv[])
     ensure_equals(s.srv.argv[0], "/usr/bin/Xnest");
     ensure_equals(s.srv.argv[1], ":0");
     ensure_equals(s.srv.argv[2], "foo");
-    ensure_equals(s.srv.argv[3], NULL);
+    ensure_equals(s.srv.argv[3], "-nolisten");
+    ensure_equals(s.srv.argv[4], "tcp");
+    ensure_equals(s.srv.argv[5], NULL);
     ensure_equals(s.srv.name, ":0");
     ensure_equali(s.vt.conf_initial_vt, 7);
     nodm_display_manager_cleanup(&s);
@@ -99,7 +111,9 @@ int main(int argc, char* argv[])
     ensure_equals(s.srv.argv[0], "/usr/bin/X");
     ensure_equals(s.srv.argv[1], ":1");
     ensure_equals(s.srv.argv[2], "foo");
-    ensure_equals(s.srv.argv[3], NULL);
+    ensure_equals(s.srv.argv[3], "-nolisten");
+    ensure_equals(s.srv.argv[4], "tcp");
+    ensure_equals(s.srv.argv[5], NULL);
     ensure_equals(s.srv.name, ":1");
     ensure_equali(s.vt.conf_initial_vt, 7);
     nodm_display_manager_cleanup(&s);
@@ -109,7 +123,9 @@ int main(int argc, char* argv[])
     ensure_equals(s.srv.argv[0], "/usr/bin/Xnest");
     ensure_equals(s.srv.argv[1], ":1");
     ensure_equals(s.srv.argv[2], "foo");
-    ensure_equals(s.srv.argv[3], NULL);
+    ensure_equals(s.srv.argv[3], "-nolisten");
+    ensure_equals(s.srv.argv[4], "tcp");
+    ensure_equals(s.srv.argv[5], NULL);
     ensure_equals(s.srv.name, ":1");
     ensure_equali(s.vt.conf_initial_vt, 7);
     nodm_display_manager_cleanup(&s);
@@ -119,7 +135,9 @@ int main(int argc, char* argv[])
     ensure_equals(s.srv.argv[0], "/usr/bin/X");
     ensure_equals(s.srv.argv[1], ":0");
     ensure_equals(s.srv.argv[2], "vt2");
-    ensure_equals(s.srv.argv[3], NULL);
+    ensure_equals(s.srv.argv[3], "-nolisten");
+    ensure_equals(s.srv.argv[4], "tcp");
+    ensure_equals(s.srv.argv[5], NULL);
     ensure_equals(s.srv.name, ":0");
     ensure_equali(s.vt.conf_initial_vt, -1);
     nodm_display_manager_cleanup(&s);
@@ -130,7 +148,36 @@ int main(int argc, char* argv[])
     ensure_equals(s.srv.argv[1], ":1");
     ensure_equals(s.srv.argv[2], "vt42");
     ensure_equals(s.srv.argv[3], "foo");
-    ensure_equals(s.srv.argv[4], NULL);
+    ensure_equals(s.srv.argv[4], "-nolisten");
+    ensure_equals(s.srv.argv[5], "tcp");
+    ensure_equals(s.srv.argv[6], NULL);
+    ensure_equals(s.srv.name, ":1");
+    ensure_equali(s.vt.conf_initial_vt, -1);
+    nodm_display_manager_cleanup(&s);
+
+    nodm_display_manager_init(&s);
+    nodm_display_manager_parse_xcmdline(&s, "/usr/bin/Xnest :1 vt42 -nolisten foo");
+    ensure_equals(s.srv.argv[0], "/usr/bin/Xnest");
+    ensure_equals(s.srv.argv[1], ":1");
+    ensure_equals(s.srv.argv[2], "vt42");
+    ensure_equals(s.srv.argv[3], "-nolisten");
+    ensure_equals(s.srv.argv[4], "foo");
+    ensure_equals(s.srv.argv[5], "-nolisten");
+    ensure_equals(s.srv.argv[6], "tcp");
+    ensure_equals(s.srv.argv[7], NULL);
+    ensure_equals(s.srv.name, ":1");
+    ensure_equali(s.vt.conf_initial_vt, -1);
+    nodm_display_manager_cleanup(&s);
+
+    nodm_display_manager_init(&s);
+    nodm_display_manager_parse_xcmdline(&s, "/usr/bin/Xnest :1 vt42 -nolisten tcp foo");
+    ensure_equals(s.srv.argv[0], "/usr/bin/Xnest");
+    ensure_equals(s.srv.argv[1], ":1");
+    ensure_equals(s.srv.argv[2], "vt42");
+    ensure_equals(s.srv.argv[3], "-nolisten");
+    ensure_equals(s.srv.argv[4], "tcp");
+    ensure_equals(s.srv.argv[5], "foo");
+    ensure_equals(s.srv.argv[6], NULL);
     ensure_equals(s.srv.name, ":1");
     ensure_equali(s.vt.conf_initial_vt, -1);
     nodm_display_manager_cleanup(&s);

-- 
Automatic Display Manager