Merge lp:~elopio/selenium-simple-test/flake8-1 into lp:selenium-simple-test

[Leo Arias]

Fixed the import in some acceptance tests.

2 more cents for the pep8 cause.

[Corey Goldberg (coreygoldberg)]

lgtm

review: Approve

[Corey Goldberg (coreygoldberg)]

landing this now. I have a followup branch with more (all) imports fixed in acceptance tests.

=== modified file 'src/sst/selftests/no_js.py'
--- src/sst/selftests/no_js.py	2013-04-16 15:25:57 +0000
+++ src/sst/selftests/no_js.py	2013-04-19 08:09:29 +0000
@@ -1,15 +1,15 @@
-from sst.actions import *
+import sst.actions
 from sst import config
 
 # disabling javascript is currently only implemented for Firefox in sst
 if config.browser_type != 'firefox':
-    skip()
-
-JAVASCRIPT_DISABLED = True
-
-go_to('/nojs/')
-
-assert_text('test', "Before JS")
+    sst.actions.skip()
+
+sst.actions.JAVASCRIPT_DISABLED = True
+
+sst.actions.go_to('/nojs/')
+
+sst.actions.assert_text('test', "Before JS")
 
 from sst import config
 assert config.javascript_disabled

=== modified file 'src/sst/selftests/prefs_set_trusted.py'
--- src/sst/selftests/prefs_set_trusted.py	2013-03-11 14:52:46 +0000
+++ src/sst/selftests/prefs_set_trusted.py	2013-04-19 08:09:29 +0000
@@ -1,6 +1,6 @@
-from sst.actions import *
-
-
-ASSUME_TRUSTED_CERT_ISSUER = True
-
-assert ASSUME_TRUSTED_CERT_ISSUER
+import sst.actions
+
+
+sst.actions.ASSUME_TRUSTED_CERT_ISSUER = True
+
+assert sst.actions.ASSUME_TRUSTED_CERT_ISSUER

=== modified file 'src/sst/selftests/radio.py'
--- src/sst/selftests/radio.py	2011-12-07 19:35:25 +0000
+++ src/sst/selftests/radio.py	2013-04-19 08:09:29 +0000
@@ -1,36 +1,38 @@
-from sst.actions import *
-
-go_to('/')
-
-assert_radio('radio_with_id_1')
-assert_radio(get_element(id='radio_with_id_1'))
-fails(assert_radio, 'does not exist')
-fails(assert_radio, 'headline')
-
-assert_radio_value('radio_with_id_1', True)
-assert_radio_value(get_element(id='radio_with_id_1'), True)
-fails(assert_radio_value, 'radio_with_id_1', False)
-fails(assert_radio_value, 'headline', True)
-
-assert_radio_value('radio_with_id_2', False)
-fails(assert_radio_value, 'radio_with_id_2', True)
-
-set_radio_value('radio_with_id_1')
-assert_radio_value('radio_with_id_1', True)
-assert_radio_value('radio_with_id_2', False)
-
-set_radio_value('radio_with_id_2')
-assert_radio_value('radio_with_id_1', False)
-assert_radio_value('radio_with_id_2', True)
-
-set_radio_value(get_element(id='radio_with_id_1'))
-assert_radio_value('radio_with_id_1', True)
-assert_radio_value('radio_with_id_2', False)
-
-fails(set_radio_value, 'does not exist')
-fails(set_radio_value, 'headline')
-
-assert_text('label1', 'First')
-fails(assert_text, 'label1', 'the wrong text')
-fails(assert_text, 'does not exist', 'does not matter')
-fails(assert_text, 'radio_with_id_1', 'has no text')
+import sst.actions
+
+
+sst.actions.go_to('/')
+
+sst.actions.assert_radio('radio_with_id_1')
+sst.actions.assert_radio(sst.actions.get_element(id='radio_with_id_1'))
+sst.actions.fails(sst.actions.assert_radio, 'does not exist')
+sst.actions.fails(sst.actions.assert_radio, 'headline')
+
+sst.actions.assert_radio_value('radio_with_id_1', True)
+sst.actions.assert_radio_value(
+    sst.actions.get_element(id='radio_with_id_1'), True)
+sst.actions.fails(sst.actions.assert_radio_value, 'radio_with_id_1', False)
+sst.actions.fails(sst.actions.assert_radio_value, 'headline', True)
+
+sst.actions.assert_radio_value('radio_with_id_2', False)
+sst.actions.fails(sst.actions.assert_radio_value, 'radio_with_id_2', True)
+
+sst.actions.set_radio_value('radio_with_id_1')
+sst.actions.assert_radio_value('radio_with_id_1', True)
+sst.actions.assert_radio_value('radio_with_id_2', False)
+
+sst.actions.set_radio_value('radio_with_id_2')
+sst.actions.assert_radio_value('radio_with_id_1', False)
+sst.actions.assert_radio_value('radio_with_id_2', True)
+
+sst.actions.set_radio_value(sst.actions.get_element(id='radio_with_id_1'))
+sst.actions.assert_radio_value('radio_with_id_1', True)
+sst.actions.assert_radio_value('radio_with_id_2', False)
+
+sst.actions.fails(sst.actions.set_radio_value, 'does not exist')
+sst.actions.fails(sst.actions.set_radio_value, 'headline')
+
+sst.actions.assert_text('label1', 'First')
+sst.actions.fails(sst.actions.assert_text, 'label1', 'the wrong text')
+sst.actions.fails(sst.actions.assert_text, 'does not exist', 'does not matter')
+sst.actions.fails(sst.actions.assert_text, 'radio_with_id_1', 'has no text')

=== modified file 'src/sst/selftests/refresh.py'
--- src/sst/selftests/refresh.py	2012-03-30 12:07:06 +0000
+++ src/sst/selftests/refresh.py	2013-04-19 08:09:29 +0000
@@ -1,11 +1,12 @@
-from sst.actions import *
-
-go_to('/')
-
-assert_title('The Page Title')
-assert_url('/')
-
-refresh()
-
-assert_title('The Page Title')
-assert_url('/')
+import sst.actions
+
+
+sst.actions.go_to('/')
+
+sst.actions.assert_title('The Page Title')
+sst.actions.assert_url('/')
+
+sst.actions.refresh()
+
+sst.actions.assert_title('The Page Title')
+sst.actions.assert_url('/')

=== modified file 'src/sst/selftests/run_test.py'
--- src/sst/selftests/run_test.py	2012-12-16 15:25:23 +0000
+++ src/sst/selftests/run_test.py	2013-04-19 08:09:29 +0000
@@ -1,11 +1,12 @@
 from sst import actions
-from sst.actions import *
+import sst.actions
+
 
 foo = 3
-set_wait_timeout(1, 0.2)
-set_base_url('http://foo/')
+sst.actions.set_wait_timeout(1, 0.2)
+sst.actions.set_base_url('http://foo/')
 
-args = run_test('_test')
+args = sst.actions.run_test('_test')
 assert args == {
     'one': 'foo',
     'two': 2
@@ -17,7 +18,7 @@
 assert actions._POLL == 0.2
 assert actions.BASE_URL == 'http://foo/'
 
-args = run_test('_test', one='ONE', two=3.1)
+args = sst.actions.run_test('_test', one='ONE', two=3.1)
 assert args == {
     'one': 'ONE',
     'two': 3.1

=== modified file 'src/sst/selftests/select.py'
--- src/sst/selftests/select.py	2012-12-16 15:25:23 +0000
+++ src/sst/selftests/select.py	2013-04-19 08:09:29 +0000
@@ -1,21 +1,24 @@
-from sst.actions import *
-
-go_to('/')
-
-assert_dropdown('select_with_id_1')
-
-assert_dropdown(get_element(id='select_with_id_1'))
-
-fails(assert_dropdown, 'fake_id')
-
-fails(assert_dropdown, 'headline')
-
-set_dropdown_value('select_with_id_1', 'Select Two')
-assert_dropdown_value('select_with_id_1', 'Select Two')
+import sst.actions
+
+
+sst.actions.go_to('/')
+
+sst.actions.assert_dropdown('select_with_id_1')
+
+sst.actions.assert_dropdown(sst.actions.get_element(id='select_with_id_1'))
+
+sst.actions.fails(sst.actions.assert_dropdown, 'fake_id')
+
+sst.actions.fails(sst.actions.assert_dropdown, 'headline')
+
+sst.actions.set_dropdown_value('select_with_id_1', 'Select Two')
+sst.actions.assert_dropdown_value('select_with_id_1', 'Select Two')
 
 #  the following should fail saying that the option
 #  is not set to the expected value
-fails(assert_dropdown_value, 'select_with_id_1', 'Fake Text')
+sst.actions.fails(
+    sst.actions.assert_dropdown_value, 'select_with_id_1', 'Fake Text')
 
 #  The following should fail saying that the option does not exist
-fails(set_dropdown_value, 'select_with_id_1', 'Fake Text')
+sst.actions.fails(
+    sst.actions.set_dropdown_value, 'select_with_id_1', 'Fake Text')

=== modified file 'src/sst/selftests/shared/helpers.py'
--- src/sst/selftests/shared/helpers.py	2013-04-18 18:37:10 +0000
+++ src/sst/selftests/shared/helpers.py	2013-04-19 08:09:29 +0000
@@ -1,7 +1,7 @@
 import os
 import shutil
 
-from sst.actions import *
+import sst.actions
 
 
 def skip_as_jenkins():
@@ -11,7 +11,7 @@
     except KeyError:
         user = 'notjenkins'
     if user.lower() == 'jenkins':
-        skip()
+        sst.actions.skip()
 
 
 def setup_cleanup_test_db():
@@ -23,4 +23,4 @@
     if os.path.isfile(test_db):
         os.remove(test_db)
     shutil.copyfile(test_db + '.original', test_db)
-    add_cleanup(os.remove, test_db)
+    sst.actions.add_cleanup(os.remove, test_db)

=== modified file 'src/sst/selftests/source.py'
--- src/sst/selftests/source.py	2012-08-24 13:24:44 +0000
+++ src/sst/selftests/source.py	2013-04-19 08:09:29 +0000
@@ -1,11 +1,11 @@
-from sst.actions import *
+import sst.actions
 
 
 # test get_page_source
 
-go_to('/')
+sst.actions.go_to('/')
 
-txt = get_page_source()
+txt = sst.actions.get_page_source()
 
 assert (txt != '')
 assert '<html' in txt
@@ -15,7 +15,7 @@
 
 # test get_element_source
 
-elems = get_elements(tag='p')
+elems = sst.actions.get_elements(tag='p')
 for elem in elems:
-    txt = get_element_source(elem)
+    txt = sst.actions.get_element_source(elem)
     assert (len(txt) >= 0)

=== modified file 'src/sst/selftests/static_file.py'
--- src/sst/selftests/static_file.py	2012-12-16 15:25:23 +0000
+++ src/sst/selftests/static_file.py	2013-04-19 08:09:29 +0000
@@ -3,19 +3,19 @@
 
 import os
 
-from sst.actions import *
+import sst.actions
 
 
 static_file = os.path.join(''.join(os.path.split(__file__)[:-1]),
                            'static.html')
 
 # using full path
-go_to('file:////%s' % static_file)
-assert_title('The Static Page')
-assert_element(tag='h1', text='Hello World')
+sst.actions.go_to('file:////%s' % static_file)
+sst.actions.assert_title('The Static Page')
+sst.actions.assert_element(tag='h1', text='Hello World')
 
 # using base_url
-set_base_url('file:////')
-go_to(static_file)
-assert_title('The Static Page')
-assert_element(tag='h1', text='Hello World')
+sst.actions.set_base_url('file:////')
+sst.actions.go_to(static_file)
+sst.actions.assert_title('The Static Page')
+sst.actions.assert_element(tag='h1', text='Hello World')

=== modified file 'src/sst/selftests/subdirectory/run_test.py'
--- src/sst/selftests/subdirectory/run_test.py	2012-12-16 15:25:23 +0000
+++ src/sst/selftests/subdirectory/run_test.py	2013-04-19 08:09:29 +0000
@@ -1,11 +1,11 @@
-from sst import actions
-from sst.actions import *
+import sst.actions
+
 
 foo = 3
-set_wait_timeout(1, 0.2)
-set_base_url('http://foo/')
+sst.actions.set_wait_timeout(1, 0.2)
+sst.actions.set_base_url('http://foo/')
 
-args = run_test('../_test')
+args = sst.actions.run_test('../_test')
 assert args == {
     'one': 'foo',
     'two': 2
@@ -13,11 +13,11 @@
 
 # check the context hasn't been altered
 assert foo == 3
-assert actions._TIMEOUT == 1
-assert actions._POLL == 0.2
-assert actions.BASE_URL == 'http://foo/'
+assert sst.actions._TIMEOUT == 1
+assert sst.actions._POLL == 0.2
+assert sst.actions.BASE_URL == 'http://foo/'
 
-args = run_test('../_test', one='ONE', two=3.1)
+args = sst.actions.run_test('../_test', one='ONE', two=3.1)
 assert args == {
     'one': 'ONE',
     'two': 3.1

=== modified file 'src/sst/selftests/switch_to_frame.py'
--- src/sst/selftests/switch_to_frame.py	2013-04-16 15:25:57 +0000
+++ src/sst/selftests/switch_to_frame.py	2013-04-19 08:09:29 +0000
@@ -1,43 +1,43 @@
-from sst.actions import *
+import sst.actions
 from sst import config
 
 # PhantomJS can not do multiple windows by design
 if config.browser_type == 'phantomjs':
-    skip()
+    sst.actions.skip()
 
-go_to('/')
-click_link('popup_link')
+sst.actions.go_to('/')
+sst.actions.click_link('popup_link')
 
 # switch to new window/tab
-switch_to_window('_NEW_WINDOW')
-assert_title('Popup Window')
+sst.actions.switch_to_window('_NEW_WINDOW')
+sst.actions.assert_title('Popup Window')
 
 # fails when frame index is out of range
-fails(switch_to_frame, index_or_name=2)
+sst.actions.fails(sst.actions.switch_to_frame, index_or_name=2)
 
 # switch to a valid frame index
-switch_to_frame(index_or_name=1)
-elem = get_element(id='frame_b_id')
-assert_text(elem, 'Frame B text here')
+sst.actions.switch_to_frame(index_or_name=1)
+elem = sst.actions.get_element(id='frame_b_id')
+sst.actions.assert_text(elem, 'Frame B text here')
 
 # fails because we are in sibling frame
-fails(get_element, id='frame_a_id')
+sst.actions.fails(sst.actions.get_element, id='frame_a_id')
 
 # switch back to default frame
-switch_to_frame()
-get_element(tag='p', id='popup_id', text='Popup text here')
-assert_title('Popup Window')
+sst.actions.switch_to_frame()
+sst.actions.get_element(tag='p', id='popup_id', text='Popup text here')
+sst.actions.assert_title('Popup Window')
 
 # switch to a valid frame name
-switch_to_frame(index_or_name='frame_a')
-elem = get_element(id='frame_a_id')
-assert_text(elem, 'Frame A text here')
+sst.actions.switch_to_frame(index_or_name='frame_a')
+elem = sst.actions.get_element(id='frame_a_id')
+sst.actions.assert_text(elem, 'Frame A text here')
 
 # switch back to default frame
-switch_to_frame()
-get_element(tag='p', id='popup_id', text='Popup text here')
-assert_title('Popup Window')
+sst.actions.switch_to_frame()
+sst.actions.get_element(tag='p', id='popup_id', text='Popup text here')
+sst.actions.assert_title('Popup Window')
 
 # switch back to default/main window/tab
-switch_to_window()
-assert_title('The Page Title')
+sst.actions.switch_to_window()
+sst.actions.assert_title('The Page Title')

=== modified file 'src/sst/selftests/switch_to_window.py'
--- src/sst/selftests/switch_to_window.py	2013-04-16 15:25:57 +0000
+++ src/sst/selftests/switch_to_window.py	2013-04-19 08:09:29 +0000
@@ -1,52 +1,52 @@
-from sst.actions import *
+import sst.actions
 from sst import config
 
 # PhantomJS can not do multiple windows by design
 if config.browser_type == 'phantomjs':
-    skip()
+    sst.actions.skip()
 
-go_to('/')
-click_link('popup_link')
+sst.actions.go_to('/')
+sst.actions.click_link('popup_link')
 
 # switch to new window/tab
-switch_to_window(index_or_name='_NEW_WINDOW')
-assert_title('Popup Window')
+sst.actions.switch_to_window(index_or_name='_NEW_WINDOW')
+sst.actions.assert_title('Popup Window')
 
 # switch back to default/main window/tab
-switch_to_window()
-assert_title('The Page Title')
+sst.actions.switch_to_window()
+sst.actions.assert_title('The Page Title')
 
 # switch to new window/tab
-switch_to_window('_NEW_WINDOW')
-assert_title('Popup Window')
+sst.actions.switch_to_window('_NEW_WINDOW')
+sst.actions.assert_title('Popup Window')
 
 # verify we can access content in new window
-elem = get_element(tag='p', id='popup_id', text='Popup text here')
-assert_text(elem, 'Popup text here')
+elem = sst.actions.get_element(tag='p', id='popup_id', text='Popup text here')
+sst.actions.assert_text(elem, 'Popup text here')
 
 # switch back to default/main window/tab
-switch_to_window(index_or_name='')
-assert_title('The Page Title')
+sst.actions.switch_to_window(index_or_name='')
+sst.actions.assert_title('The Page Title')
 
 # switch to new window/tab using index
-switch_to_window(index_or_name=1)
-assert_title('Popup Window')
+sst.actions.switch_to_window(index_or_name=1)
+sst.actions.assert_title('Popup Window')
 
 # switch back to default/main window using index
-switch_to_window(0)
-assert_title('The Page Title')
-
-# fails when the window name does not exist
-fails(switch_to_window, index_or_name='not_a_window')
-
-# fails when the window name does not exist
-fails(switch_to_window, 'not_a_window')
-
-# fails when the window index does not exist
-fails(switch_to_window, index_or_name=99)
-
-# fails when the window index does not exist
-fails(switch_to_window, 99)
+sst.actions.switch_to_window(0)
+sst.actions.assert_title('The Page Title')
+
+# fails when the window name does not exist
+sst.actions.fails(sst.actions.switch_to_window, index_or_name='not_a_window')
+
+# fails when the window name does not exist
+sst.actions.fails(sst.actions.switch_to_window, 'not_a_window')
+
+# fails when the window index does not exist
+sst.actions.fails(sst.actions.switch_to_window, index_or_name=99)
+
+# fails when the window index does not exist
+sst.actions.fails(sst.actions.switch_to_window, 99)
 
 # verify we are still back on main window
-assert_title('The Page Title')
+sst.actions.assert_title('The Page Title')

=== modified file 'src/sst/selftests/tables.py'
--- src/sst/selftests/tables.py	2012-12-16 15:25:23 +0000
+++ src/sst/selftests/tables.py	2013-04-19 08:09:29 +0000
@@ -1,42 +1,49 @@
-from sst.actions import *
-
-go_to('/tables')
-
-assert_table_headers('empty', ['Head 0', 'Head 1', 'Head 2', 'Head 3'])
-assert_table_has_rows('empty', 0)
-assert_table_has_rows('one-row', 1)
-
-fails(assert_table_headers, 'notthere',
-      ['Head 0', 'Head 1', 'Head 2', 'Head 3'])
-fails(assert_table_headers, 'empty', ['Head 0', 'Head 1', 'Head 2'])
-fails(assert_table_headers, 'empty',
-      ['Wrong', 'Head 1', 'Head 2', 'Head 3'])
-fails(assert_table_has_rows, 'notthere', 0)
-fails(assert_table_has_rows, 'empty', 1)
+import sst.actions
+
+sst.actions.go_to('/tables')
+
+sst.actions.assert_table_headers(
+    'empty', ['Head 0', 'Head 1', 'Head 2', 'Head 3'])
+sst.actions.assert_table_has_rows('empty', 0)
+sst.actions.assert_table_has_rows('one-row', 1)
+
+sst.actions.fails(
+    sst.actions.assert_table_headers, 'notthere',
+    ['Head 0', 'Head 1', 'Head 2', 'Head 3'])
+sst.actions.fails(
+    sst.actions.assert_table_headers, 'empty', ['Head 0', 'Head 1', 'Head 2'])
+sst.actions.fails(
+    sst.actions.assert_table_headers, 'empty',
+    ['Wrong', 'Head 1', 'Head 2', 'Head 3'])
+sst.actions.fails(sst.actions.assert_table_has_rows, 'notthere', 0)
+sst.actions.fails(sst.actions.assert_table_has_rows, 'empty', 1)
 
 # XXXX Should this be able to work?
-fails(assert_table_has_rows, 'no-body', 0)
-
-fails(assert_table_has_rows, 'one-row', 0)
-fails(assert_table_has_rows, 'one-row', 2)
-
-assert_table_row_contains_text('one-row', 0,
-                               ['Cell 0', 'Cell 1', 'Cell 2', 'Cell 3'])
-assert_table_row_contains_text('one-row', 0,
-                               ['Cell 0', 'Cell 1', 'Cell 2', 'Cell 3'],
-                               regex=True)
-assert_table_row_contains_text('one-row', 0,
-                               ['^Cell', '^Cell', '^Cell', '^Cell'],
-                               regex=True)
-
-fails(assert_table_row_contains_text, 'one-row', 0,
-      ['Wrong', 'Cell 1', 'Cell 2', 'Cell 3'])
-fails(assert_table_row_contains_text, 'one-row', 0,
-      ['Cell 0', 'Cell 1', 'Cell 2'])
-fails(assert_table_row_contains_text, 'one-row', 0,
-      ['Cell 0', 'Cell 1', 'Cell 2', 'Extra'])
-fails(assert_table_row_contains_text, 'one-row', 1, [])
-fails(assert_table_row_contains_text, 'one-row', 0,
-      ['Wrong', 'Cell 1', 'Cell 2', 'Cell 3'], regex=True)
-fails(assert_table_row_contains_text, 'one-row', 0,
-      ['Cell 0', 'Cell 1', 'Cell 2'], regex=True)
+sst.actions.fails(sst.actions.assert_table_has_rows, 'no-body', 0)
+
+sst.actions.fails(sst.actions.assert_table_has_rows, 'one-row', 0)
+sst.actions.fails(sst.actions.assert_table_has_rows, 'one-row', 2)
+
+sst.actions.assert_table_row_contains_text(
+    'one-row', 0, ['Cell 0', 'Cell 1', 'Cell 2', 'Cell 3'])
+sst.actions.assert_table_row_contains_text(
+    'one-row', 0, ['Cell 0', 'Cell 1', 'Cell 2', 'Cell 3'], regex=True)
+sst.actions.assert_table_row_contains_text(
+    'one-row', 0, ['^Cell', '^Cell', '^Cell', '^Cell'], regex=True)
+
+sst.actions.fails(
+    sst.actions.assert_table_row_contains_text, 'one-row', 0,
+    ['Wrong', 'Cell 1', 'Cell 2', 'Cell 3'])
+sst.actions.fails(
+    sst.actions.assert_table_row_contains_text, 'one-row', 0,
+    ['Cell 0', 'Cell 1', 'Cell 2'])
+sst.actions.fails(
+    sst.actions.assert_table_row_contains_text, 'one-row', 0,
+    ['Cell 0', 'Cell 1', 'Cell 2', 'Extra'])
+sst.actions.fails(sst.actions.assert_table_row_contains_text, 'one-row', 1, [])
+sst.actions.fails(
+    sst.actions.assert_table_row_contains_text, 'one-row', 0,
+    ['Wrong', 'Cell 1', 'Cell 2', 'Cell 3'], regex=True)
+sst.actions.fails(
+    sst.actions.assert_table_row_contains_text, 'one-row', 0,
+    ['Cell 0', 'Cell 1', 'Cell 2'], regex=True)

=== modified file 'src/sst/selftests/text.py'
--- src/sst/selftests/text.py	2011-12-07 19:35:25 +0000
+++ src/sst/selftests/text.py	2013-04-19 08:09:29 +0000
@@ -1,13 +1,13 @@
-from sst.actions import *
+import sst.actions
 
 # tests for assert_text, text_contains
 
-go_to('/')
-
-title = get_element(tag='title')
-assert_text(title, 'The Page Title')
-assert_text_contains(title, 'The Page')
-fails(assert_text_contains, title, 'foobar')
-
-body = get_element(tag='body')
-assert_text_contains(body, '.*[C|c]ountry.*', regex=True)
+sst.actions.go_to('/')
+
+title = sst.actions.get_element(tag='title')
+sst.actions.assert_text(title, 'The Page Title')
+sst.actions.assert_text_contains(title, 'The Page')
+sst.actions.fails(sst.actions.assert_text_contains, title, 'foobar')
+
+body = sst.actions.get_element(tag='body')
+sst.actions.assert_text_contains(body, '.*[C|c]ountry.*', regex=True)

=== modified file 'src/sst/selftests/textfield.py'
--- src/sst/selftests/textfield.py	2012-12-16 15:25:23 +0000
+++ src/sst/selftests/textfield.py	2013-04-19 08:09:29 +0000
@@ -1,37 +1,37 @@
-from sst.actions import *
+import sst.actions
 
 
 # password functionality is so close to textfield that
 # we will include it with common textfield use
 
 
-go_to('/')
-
-assert_textfield('text_1')
-assert_textfield(get_element(id='text_1'))
-
-assert_textfield('pass_1')
-assert_textfield(get_element(id='pass_1'))
+sst.actions.go_to('/')
+
+sst.actions.assert_textfield('text_1')
+sst.actions.assert_textfield(sst.actions.get_element(id='text_1'))
+
+sst.actions.assert_textfield('pass_1')
+sst.actions.assert_textfield(sst.actions.get_element(id='pass_1'))
 
 # fails for non existent element
-fails(assert_textfield, 'foobar')
+sst.actions.fails(sst.actions.assert_textfield, 'foobar')
 # fails for element that exists but isn't a textfield
-fails(assert_textfield, 'radio_with_id_1')
-
-write_textfield('text_1', 'I pity the Foobar..')
-assert_text('text_1', "I pity the Foobar..")
-
-write_textfield('text_1', 'Overwriting')
-assert_text('text_1', "Overwriting")
-
-write_textfield('text_1', 'No checking', check=False)
-assert_text('text_1', 'No checking')
+sst.actions.fails(sst.actions.assert_textfield, 'radio_with_id_1')
+
+sst.actions.write_textfield('text_1', 'I pity the Foobar..')
+sst.actions.assert_text('text_1', "I pity the Foobar..")
+
+sst.actions.write_textfield('text_1', 'Overwriting')
+sst.actions.assert_text('text_1', "Overwriting")
+
+sst.actions.write_textfield('text_1', 'No checking', check=False)
+sst.actions.assert_text('text_1', 'No checking')
 
 # check with empty text
-write_textfield('text_1', '')
-assert_text('text_1', '')
+sst.actions.write_textfield('text_1', '')
+sst.actions.assert_text('text_1', '')
 
 # checks the password field to see if it is editable
-write_textfield('pass_1', 'qaT3st')
-assert_text('pass_1', 'qaT3st')
-fails(assert_text, 'pass_1', 'fake_text')
+sst.actions.write_textfield('pass_1', 'qaT3st')
+sst.actions.assert_text('pass_1', 'qaT3st')
+sst.actions.fails(sst.actions.assert_text, 'pass_1', 'fake_text')

=== modified file 'src/sst/selftests/title.py'
--- src/sst/selftests/title.py	2013-04-11 14:18:49 +0000
+++ src/sst/selftests/title.py	2013-04-19 08:09:29 +0000
@@ -1,39 +1,39 @@
-from sst.actions import *
+import sst.actions
 from sst import DEVSERVER_PORT
 
 # tests go_to, assert_url, assert_title, set_base_url
 # reset_base_url, get_base_url
 
-go_to('/')
-
-assert_url('/')
-fails(assert_url, '/foo')
-
-assert_title('The Page Title')
-fails(assert_title, 'this is not the title')
-
-assert_title_contains('The Page')
-assert_title_contains('.*Pag[E|e]', regex=True)
-fails(assert_title_contains, 'foobar')
-
-set_base_url('localhost:%s' % DEVSERVER_PORT)
-assert get_base_url() == 'http://localhost:%s' % DEVSERVER_PORT
-
-set_base_url('http://localhost:%s/' % DEVSERVER_PORT)
-assert get_base_url() == 'http://localhost:%s/' % DEVSERVER_PORT
-go_to('/')
+sst.actions.go_to('/')
+
+sst.actions.assert_url('/')
+sst.actions.fails(sst.actions.assert_url, '/foo')
+
+sst.actions.assert_title('The Page Title')
+sst.actions.fails(sst.actions.assert_title, 'this is not the title')
+
+sst.actions.assert_title_contains('The Page')
+sst.actions.assert_title_contains('.*Pag[E|e]', regex=True)
+sst.actions.fails(sst.actions.assert_title_contains, 'foobar')
+
+sst.actions.set_base_url('localhost:%s' % DEVSERVER_PORT)
+assert sst.actions.get_base_url() == 'http://localhost:%s' % DEVSERVER_PORT
+
+sst.actions.set_base_url('http://localhost:%s/' % DEVSERVER_PORT)
+assert sst.actions.get_base_url() == 'http://localhost:%s/' % DEVSERVER_PORT
+sst.actions.go_to('/')
 
 # assert_url adds the base url for relative urls
 # so test both ways
-assert_url('http://localhost:%s/' % DEVSERVER_PORT)
-assert_url('/')
-
-fails(assert_url, '/begin/')
-
-reset_base_url()
-assert get_base_url() == 'http://localhost:%s/' % DEVSERVER_PORT
-go_to('/')
-assert_url('http://localhost:%s/' % DEVSERVER_PORT)
+sst.actions.assert_url('http://localhost:%s/' % DEVSERVER_PORT)
+sst.actions.assert_url('/')
+
+sst.actions.fails(sst.actions.assert_url, '/begin/')
+
+sst.actions.reset_base_url()
+assert sst.actions.get_base_url() == 'http://localhost:%s/' % DEVSERVER_PORT
+sst.actions.go_to('/')
+sst.actions.assert_url('http://localhost:%s/' % DEVSERVER_PORT)
 
 # assert_url works also without the trailing slash
-assert_url('http://localhost:%s' % DEVSERVER_PORT)
+sst.actions.assert_url('http://localhost:%s' % DEVSERVER_PORT)

=== modified file 'src/sst/selftests/unicode.py'
--- src/sst/selftests/unicode.py	2013-04-16 15:25:57 +0000
+++ src/sst/selftests/unicode.py	2013-04-19 08:09:29 +0000
@@ -1,24 +1,24 @@
-from sst.actions import *
+import sst.actions
 from sst import config
 
 # currently failing in Chrome.  
 # need to investigate and file upstream chromedriver bug.
 if config.browser_type == 'chrome':
-    skip()
+    sst.actions.skip()
 
-go_to('/')
+sst.actions.go_to('/')
 
 u = u'abcdéשאלק'
-write_textfield('text_1', u)
-assert_text('text_1', u)
-assert_text_contains('text_1', u)
+sst.actions.write_textfield('text_1', u)
+sst.actions.assert_text('text_1', u)
+sst.actions.assert_text_contains('text_1', u)
 
 u = u'\u05e9\u05d0\u05dc\u05e7'
-write_textfield('text_1', u)
-assert_text('text_1', u)
-assert_text_contains('text_1', u)
+sst.actions.write_textfield('text_1', u)
+sst.actions.assert_text('text_1', u)
+sst.actions.assert_text_contains('text_1', u)
 
 u = unichr(40960) + u'abcd' + unichr(1972)
-write_textfield('text_1', u)
-assert_text('text_1', u)
-assert_text_contains('text_1', u)
+sst.actions.write_textfield('text_1', u)
+sst.actions.assert_text('text_1', u)
+sst.actions.assert_text_contains('text_1', u)

=== modified file 'src/sst/selftests/wait_timeout.py'
--- src/sst/selftests/wait_timeout.py	2012-09-30 05:49:34 +0000
+++ src/sst/selftests/wait_timeout.py	2013-04-19 08:09:29 +0000
@@ -1,8 +1,8 @@
-from sst.actions import *
-
-
-set_wait_timeout(10)
-assert get_wait_timeout() == 10
-
-set_wait_timeout(20)
-assert get_wait_timeout() == 20
+import sst.actions
+
+
+sst.actions.set_wait_timeout(10)
+assert sst.actions.get_wait_timeout() == 10
+
+sst.actions.set_wait_timeout(20)
+assert sst.actions.get_wait_timeout() == 20

=== modified file 'src/sst/selftests/waitfor.py'
--- src/sst/selftests/waitfor.py	2013-04-16 13:28:31 +0000
+++ src/sst/selftests/waitfor.py	2013-04-19 08:09:29 +0000
@@ -1,4 +1,4 @@
-from sst.actions import *
+import sst.actions
 from time import time
 
 
@@ -27,38 +27,38 @@
         return False
     return condition
 
-go_to('/')
-set_wait_timeout(0.1)
-
-wait_for(get_condition(True))
-fails(wait_for, get_condition(False))
-
-wait_for(get_condition(raises=True))
-fails(wait_for, get_condition(False, raises=True))
-
-wait_for(assert_url, '/')
-fails(wait_for, assert_url, '/thing')
-
-wait_for(assert_url, url='/')
-fails(wait_for, assert_url, url='/thing')
+sst.actions.go_to('/')
+sst.actions.set_wait_timeout(0.1)
+
+sst.actions.wait_for(get_condition(True))
+sst.actions.fails(sst.actions.wait_for, get_condition(False))
+
+sst.actions.wait_for(get_condition(raises=True))
+sst.actions.fails(sst.actions.wait_for, get_condition(False, raises=True))
+
+sst.actions.wait_for(sst.actions.assert_url, '/')
+sst.actions.fails(sst.actions.wait_for, sst.actions.assert_url, '/thing')
+
+sst.actions.wait_for(sst.actions.assert_url, url='/')
+sst.actions.fails(sst.actions.wait_for, sst.actions.assert_url, url='/thing')
 
 CALLS = 0
-set_wait_timeout(0.1, 0.01)
-fails(wait_for, get_condition(wait=0.2))
+sst.actions.set_wait_timeout(0.1, 0.01)
+sst.actions.fails(sst.actions.wait_for, get_condition(wait=0.2))
 assert CALLS > 6
 
-fails(wait_for, get_condition(wait=0.2, raises=True))
-
-set_wait_timeout(0.5)
-wait_for(get_condition(wait=0.2))
-wait_for(get_condition(wait=0.2, raises=True))
-
-set_wait_timeout(0.3, 0.1)
+sst.actions.fails(sst.actions.wait_for, get_condition(wait=0.2, raises=True))
+
+sst.actions.set_wait_timeout(0.5)
+sst.actions.wait_for(get_condition(wait=0.2))
+sst.actions.wait_for(get_condition(wait=0.2, raises=True))
+
+sst.actions.set_wait_timeout(0.3, 0.1)
 CALLS = 0
-wait_for(get_condition(wait=0.2))
+sst.actions.wait_for(get_condition(wait=0.2))
 assert CALLS <= 3
 
-set_wait_timeout(5, 0.1)
+sst.actions.set_wait_timeout(5, 0.1)
 
-wait_for_and_refresh(get_condition(True))
-fails(wait_for_and_refresh, get_condition(False))
+sst.actions.wait_for_and_refresh(get_condition(True))
+sst.actions.fails(sst.actions.wait_for_and_refresh, get_condition(False))

=== modified file 'src/sst/selftests/window_close.py'
--- src/sst/selftests/window_close.py	2013-04-16 15:25:57 +0000
+++ src/sst/selftests/window_close.py	2013-04-19 08:09:29 +0000
@@ -1,21 +1,21 @@
-from sst.actions import *
+import sst.actions
 from sst import config
 
 # PhantomJS can not do multiple windows by design
 if config.browser_type == 'phantomjs':
-    skip()
+    sst.actions.skip()
 
-go_to('/')
-click_link('popup_link')
+sst.actions.go_to('/')
+sst.actions.click_link('popup_link')
 
 # switch to new window/tab and close it
-switch_to_window(index_or_name='_NEW_WINDOW')
-assert_title('Popup Window')
-close_window()
+sst.actions.switch_to_window(index_or_name='_NEW_WINDOW')
+sst.actions.assert_title('Popup Window')
+sst.actions.close_window()
 
 # switch back to default/main window/tab
-switch_to_window()
-assert_title('The Page Title')
+sst.actions.switch_to_window()
+sst.actions.assert_title('The Page Title')
 
 # fails because the window no longer exists
-fails(switch_to_window, index_or_name='NEW_WINDOW')
+sst.actions.fails(sst.actions.switch_to_window, index_or_name='NEW_WINDOW')

=== modified file 'src/sst/selftests/window_size.py'
--- src/sst/selftests/window_size.py	2013-01-09 23:40:44 +0000
+++ src/sst/selftests/window_size.py	2013-04-19 08:09:29 +0000
@@ -1,38 +1,38 @@
-from sst.actions import *
-
-
-width, height = get_window_size()
+import sst.actions
+
+
+width, height = sst.actions.get_window_size()
 assert isinstance(width, int)
 assert isinstance(height, int)
 assert width > 0
 assert height > 0
 
-expected_width, expected_height = set_window_size(200, 300)
-width, height = get_window_size()
+expected_width, expected_height = sst.actions.set_window_size(200, 300)
+width, height = sst.actions.get_window_size()
 assert isinstance(expected_width, int)
 assert isinstance(expected_height, int)
 assert width == expected_width == 200
 assert height == expected_height == 300
 
-expected_width, expected_height = set_window_size(450, 420)
-width, height = get_window_size()
+expected_width, expected_height = sst.actions.set_window_size(450, 420)
+width, height = sst.actions.get_window_size()
 assert width == expected_width == 450
 assert height == expected_height == 420
 
-expected_width, expected_height = set_window_size(380, 320)
+expected_width, expected_height = sst.actions.set_window_size(380, 320)
 # set window to same size
-set_window_size(380, 320)
-width, height = get_window_size()
+sst.actions.set_window_size(380, 320)
+width, height = sst.actions.get_window_size()
 assert width == expected_width == 380
 assert height == expected_height == 320
 
-go_to('/')
+sst.actions.go_to('/')
 
 # switch to new window/tab and resize it
-click_link('popup_link')
-switch_to_window(index_or_name='_NEW_WINDOW')
-assert_title('Popup Window')
-expected_width, expected_height = set_window_size(260, 275)
-width, height = get_window_size()
+sst.actions.click_link('popup_link')
+sst.actions.switch_to_window(index_or_name='_NEW_WINDOW')
+sst.actions.assert_title('Popup Window')
+expected_width, expected_height = sst.actions.set_window_size(260, 275)
+width, height = sst.actions.get_window_size()
 assert width == expected_width == 260
 assert height == expected_height == 275

=== modified file 'src/sst/selftests/yui.py'
--- src/sst/selftests/yui.py	2011-12-07 19:35:25 +0000
+++ src/sst/selftests/yui.py	2013-04-19 08:09:29 +0000
@@ -1,5 +1,5 @@
-from sst.actions import *
-
-go_to('/yui')
-
-write_textfield('text_with_default_value', '25', check=True)
+import sst.actions
+
+sst.actions.go_to('/yui')
+
+sst.actions.write_textfield('text_with_default_value', '25', check=True)