Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xsugar-emulator15
-rw-r--r--tests/graphics/common.py (copied from tests/sugar/test_date.py)42
-rw-r--r--tests/graphics/ticket2855.py (copied from tests/sugar/runall.py)13
-rw-r--r--tests/lib/runall.py (renamed from tests/sugar/runall.py)0
-rw-r--r--tests/lib/test_date.py (renamed from tests/sugar/test_date.py)0
5 files changed, 46 insertions, 24 deletions
diff --git a/sugar-emulator b/sugar-emulator
index 6ab9292..cba0d52 100755
--- a/sugar-emulator
+++ b/sugar-emulator
@@ -96,7 +96,7 @@ def _start_matchbox():
cmd = ['matchbox-window-manager']
cmd.extend(['-use_titlebar', 'no'])
- cmd.extend(['-theme', 'olpc'])
+ cmd.extend(['-theme', 'sugar'])
log.debug( 'Matchbox command: %s', " ".join( cmd) )
gobject.spawn_async(cmd, flags=gobject.SPAWN_SEARCH_PATH)
@@ -150,14 +150,19 @@ def main():
os.environ['GTK2_RC_FILES'] = env.get_data_path(gtkrc_filename)
print os.environ['GTK2_RC_FILES']
+ command = ['dbus-launch', 'dbus-launch', '--exit-with-session']
+
if not args:
- program = 'sugar-shell'
+ command.append('sugar-shell')
else:
_start_matchbox()
- program = args[0]
+
+ if args[0].endswith('.py'):
+ command.append('python')
+
+ command.append(args[0])
- command = ['dbus-launch', 'dbus-launch', '--exit-with-session', program]
- log.info( "Attempting to launch sugar to replace this process: %s", " ".join(command) )
+ log.info( "Attempting to launch sugar to replace this process: %s", " ".join(command))
os.execlp( *command )
if __name__ == "__main__":
diff --git a/tests/sugar/test_date.py b/tests/graphics/common.py
index c6da871..d6ca869 100644
--- a/tests/sugar/test_date.py
+++ b/tests/graphics/common.py
@@ -15,16 +15,38 @@
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-import datetime
-import unittest
+import gtk
-from sugar.date import Date
+from sugar.graphics.toolbutton import ToolButton
-class TestDate(unittest.TestCase):
- def test_today(self):
- date = Date(datetime.date(2000, 1, 1))
- date._today = datetime.date(2000, 1, 1)
- self.assertEqual(str(date), 'Today')
+class Test(gtk.VBox):
+ def __init__(self):
+ gtk.VBox.__init__(self)
-if __name__ == "__main__":
- unittest.main()
+class TestPalette(Test):
+ def __init__(self):
+ Test.__init__(self)
+
+ toolbar = gtk.Toolbar()
+
+ button = ToolButton('stop')
+ toolbar.insert(button, -1)
+ button.show()
+
+ self.pack_start(toolbar, False)
+ toolbar.show()
+
+class TestRunner(object):
+ def run(self, test):
+ window = gtk.Window()
+ window.connect("destroy", lambda w: gtk.main_quit())
+ window.add(test)
+ test.show()
+
+ window.show()
+
+def main(test):
+ runner = TestRunner()
+ runner.run(test)
+
+ gtk.main()
diff --git a/tests/sugar/runall.py b/tests/graphics/ticket2855.py
index ff672be..a54add9 100644
--- a/tests/sugar/runall.py
+++ b/tests/graphics/ticket2855.py
@@ -15,14 +15,9 @@
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-import unittest
+import common
-import test_date
+test = common.TestPalette()
-runner = unittest.TextTestRunner()
-loader = unittest.TestLoader()
-
-suite = unittest.TestSuite()
-suite.addTest(loader.loadTestsFromModule(test_date))
-
-runner.run(suite)
+if __name__ == "__main__":
+ common.main(test)
diff --git a/tests/sugar/runall.py b/tests/lib/runall.py
index ff672be..ff672be 100644
--- a/tests/sugar/runall.py
+++ b/tests/lib/runall.py
diff --git a/tests/sugar/test_date.py b/tests/lib/test_date.py
index c6da871..c6da871 100644
--- a/tests/sugar/test_date.py
+++ b/tests/lib/test_date.py