[pitivi] dogtail: Fix the Python2 dogtail scripts to not use Pitivi Python3 code
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] dogtail: Fix the Python2 dogtail scripts to not use Pitivi Python3 code
- Date: Tue, 6 May 2014 13:02:02 +0000 (UTC)
commit d9470fbc5494fe0823d52636d2944417edebb8b2
Author: Alexandru Băluț <alexandru balut gmail com>
Date: Thu Apr 3 04:13:02 2014 +0200
dogtail: Fix the Python2 dogtail scripts to not use Pitivi Python3 code
tests/dogtail_scripts/common.py | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/tests/dogtail_scripts/common.py b/tests/dogtail_scripts/common.py
index 91fd47a..0bf84a1 100644
--- a/tests/dogtail_scripts/common.py
+++ b/tests/dogtail_scripts/common.py
@@ -15,14 +15,18 @@ import dogtail.rawinput
from pyatspi import Registry as registry
from pyatspi import KEY_PRESS, KEY_RELEASE
-from pitivi.utils import ui
-
# These are the timecodes we expect for "tears_of_steel.webm", depending on
# if we insert it once in a blank timeline or twice in a blank timeline.
DURATION_OF_ONE_CLIP = "00:01.999"
DURATION_OF_TWO_CLIPS = "00:03.999"
+# Constants from pitivi.ui
+# TODO: Use directly the constants from pitivi.ui when these UI tests are ported to Python3.
+CONTROL_WIDTH = 250
+EXPANDED_SIZE = 65
+SPACING = 10
+
class PitiviTestCase(unittest.TestCase):
@@ -416,8 +420,8 @@ class PitiviTestCase(unittest.TestCase):
def getTimelineX(self, percent):
assert percent >= 0
assert percent <= 1
- perceived_width = self.timeline.size[0] - ui.CONTROL_WIDTH
- return self.timeline.position[0] + ui.CONTROL_WIDTH + percent * perceived_width
+ perceived_width = self.timeline.size[0] - CONTROL_WIDTH
+ return self.timeline.position[0] + CONTROL_WIDTH + percent * perceived_width
def getTimelineY(self, layer, above=False):
"""
@@ -427,9 +431,9 @@ class PitiviTestCase(unittest.TestCase):
@param above: Whether instead middle of the space above.
"""
assert layer >= 0
- perceived_top = layer * (ui.EXPANDED_SIZE + ui.SPACING)
+ perceived_top = layer * (EXPANDED_SIZE + SPACING)
if above:
- perceived_top += ui.SPACING / 2
+ perceived_top += SPACING / 2
else:
- perceived_top += ui.SPACING + ui.EXPANDED_SIZE / 2
+ perceived_top += SPACING + EXPANDED_SIZE / 2
return self.timeline.position[1] + perceived_top
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]