[Ocfs2-tools-commits] manish commits r567 - trunk/ocfs2tool

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-01-20 20:58:34 -0600 (Thu, 20 Jan 2005)
New Revision: 567

Modified:
   trunk/ocfs2tool/browser.py
   trunk/ocfs2tool/clconfig.py
   trunk/ocfs2tool/general.py
   trunk/ocfs2tool/nodemap.py
Log:
Fix test harness code


Modified: trunk/ocfs2tool/browser.py
===================================================================
--- trunk/ocfs2tool/browser.py	2005-01-21 02:58:19 UTC (rev 566)
+++ trunk/ocfs2tool/browser.py	2005-01-21 02:58:34 UTC (rev 567)
@@ -61,3 +61,22 @@
              table.attach(label, i, i + 1, 1, 2)
 
              label.modify_font(font)
+
+def main():
+    import sys
+
+    def dummy(*args):
+        gtk.main_quit()
+
+    window = gtk.Window()
+    window.connect('delete_event', dummy)
+
+    browser = Browser(sys.argv[1]).widget
+    window.add(browser)
+
+    window.show_all()
+
+    gtk.main()
+
+if __name__ == '__main__':
+    main()

Modified: trunk/ocfs2tool/clconfig.py
===================================================================
--- trunk/ocfs2tool/clconfig.py	2005-01-21 02:58:19 UTC (rev 566)
+++ trunk/ocfs2tool/clconfig.py	2005-01-21 02:58:34 UTC (rev 567)
@@ -60,7 +60,7 @@
     return True
 
 def main():
-    cluster_configurator(None, True)
+    cluster_configurator(None)
 
 if __name__ == '__main__':
     main()

Modified: trunk/ocfs2tool/general.py
===================================================================
--- trunk/ocfs2tool/general.py	2005-01-21 02:58:19 UTC (rev 566)
+++ trunk/ocfs2tool/general.py	2005-01-21 02:58:34 UTC (rev 567)
@@ -82,9 +82,13 @@
 def main():
     import sys
 
+    def dummy(*args):
+        gtk.main_quit()
+
     window = gtk.Window()
+    window.connect('delete_event', dummy)
 
-    general = General(sys.argv[1], False).widget
+    general = General(sys.argv[1]).widget
     window.add(general)
 
     window.show_all()

Modified: trunk/ocfs2tool/nodemap.py
===================================================================
--- trunk/ocfs2tool/nodemap.py	2005-01-21 02:58:19 UTC (rev 566)
+++ trunk/ocfs2tool/nodemap.py	2005-01-21 02:58:34 UTC (rev 567)
@@ -67,13 +67,17 @@
 def main():
     import sys
 
+    def dummy(*args):
+        gtk.main_quit()
+
     window = gtk.Window()
-    window.show()
+    window.connect('delete_event', dummy)
 
-    nodemap = NodeMap(sys.argv[1], False).widget
+    nodemap = NodeMap(sys.argv[1]).widget
     window.add(nodemap)
 
     window.show_all()
+
     gtk.main()
 
 if __name__ == '__main__':