Merge lp:~roadmr/checkbox/1259987-scroll-method into lp:checkbox

[Daniel Manrique]

Makes use of edge scrolling by the script explicit (via commandline switch), and updates tests for edge scrolling to use this switch. Other tests should use the user's preferred scrolling method.

Makes use of edge scrolling by the script explicit (via commandline switch), and updates tests for edge scrolling to use this switch. Other tests should use the user's preferred scrolling method.

[Chris Gregan (cgregan)]

Command line switch is a solid and simple solution. Approved

review: Approve

=== modified file 'checkbox-old/debian/changelog'
--- checkbox-old/debian/changelog	2013-12-06 01:36:30 +0000
+++ checkbox-old/debian/changelog	2013-12-11 16:41:38 +0000
@@ -7,6 +7,9 @@
   [ Daniel Manrique ]
   * Removed suspend_test script which hasn't been touched in over 3 years
     and is not used in any jobs. (LP: #752881)
+  * Changed touchpad_test to use default scrolling method, and added a switch
+    to force edge scrolling if desired. Updated legacy tests to use edge
+    scrolling when the test description makes that appropriate. (LP: #1259987)
 
  -- Sylvain Pineau <[e-mail]>  Fri, 29 Nov 2013 22:30:45 +0100
 
 
=== modified file 'checkbox-old/jobs/touchpad.txt.in'
--- checkbox-old/jobs/touchpad.txt.in	2013-12-06 19:58:15 +0000
+++ checkbox-old/jobs/touchpad.txt.in	2013-12-11 16:41:38 +0000
@@ -15,7 +15,7 @@
 name: touchpad/horizontal
 requires:
   'Button Horiz Wheel Left' in xinput.button_labels and 'Button Horiz Wheel Right' in xinput.button_labels
-command: touchpad_test right left
+command: touchpad_test right left --edge-scroll
 estimated_duration: 120.0
 _description:
  PURPOSE:
@@ -30,7 +30,7 @@
 name: touchpad/vertical
 requires:
   'Button Wheel Up' in xinput.button_labels and 'Button Wheel Down' in xinput.button_labels
-command: touchpad_test up down
+command: touchpad_test up down --edge-scroll
 estimated_duration: 120.0
 _description:
  PURPOSE:
 
=== modified file 'checkbox-old/scripts/touchpad_test'
--- checkbox-old/scripts/touchpad_test	2013-05-29 07:50:30 +0000
+++ checkbox-old/scripts/touchpad_test	2013-12-11 16:41:38 +0000
@@ -28,8 +28,9 @@
     touchpad_key = "org.gnome.settings-daemon.peripherals.touchpad"
     exit_code = EXIT_WITH_FAILURE
 
-    def __init__(self, directions):
+    def __init__(self, directions, edge_scroll=False):
         self.directions = directions
+        self.edge_scroll = edge_scroll
 
         # Initialize GTK constants
         self.ICON_SIZE = Gtk.IconSize.BUTTON
@@ -123,7 +124,8 @@
 
         # Set touchpad settings.
         touchpad_settings.set_boolean("horiz-scroll-enabled", True)
-        touchpad_settings.set_string("scroll-method", "edge-scrolling")
+        if self.edge_scroll:
+            touchpad_settings.set_string("scroll-method", "edge-scrolling")
 
         Gtk.main()
 
@@ -167,8 +169,10 @@
 def main(args):
     gettext.textdomain("checkbox")
 
-    usage = """Usage: %prog DIRECTION..."""
+    usage = """Usage: %prog DIRECTION... [--edge-scroll]"""
     parser = OptionParser(usage=usage)
+    parser.add_option("--edge-scroll", action="store_true", default=False,
+                      help="Force touchpad to use edge scrolling only")
     (options, args) = parser.parse_args(args)
 
     if not args:
@@ -182,7 +186,7 @@
             parser.error("Unsupported direction: %s" % arg)
         directions.append(direction)
 
-    scroller = GtkScroller(directions)
+    scroller = GtkScroller(directions, edge_scroll=options.edge_scroll)
     try:
         scroller.run()
     except KeyboardInterrupt: