Skip to content

Commit

Permalink
Added a manifest file and updated tests for the webdriver->selenium r…
Browse files Browse the repository at this point in the history
…ename in py bindings. Thanks jfroche and __gotcha!

r8428
  • Loading branch information
hugs committed Feb 23, 2010
1 parent 23346de commit 0bb4a95
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 23 deletions.
11 changes: 11 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
prune *
global-include build/webdriver-extension.zip
recursive-include common/src/py *.py
recursive-include common/test/py *.py
recursive-include chrome/src/py *.py
recursive-include chrome/test/py *.py
recursive-include firefox/src/py *.py
recursive-include jobbie/src/py *.py
recursive-include jobbie/test/py *.py
recursive-include remote/client/src/py *.py
recursive-include remote/client/test/py *.py
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ task :test_firefox_py => [:firefox, :firefox_xpi] do
end
end
sh "build/python/bin/python setup.py build install", :verbose => true
sh "build/python/bin/python build/lib/webdriver/py_test.py", :verbose => true
sh "build/python/bin/python build/lib/selenium/py_test.py", :verbose => true
end
end

Expand Down
12 changes: 6 additions & 6 deletions common/test/py/api_examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@
import sys
import unittest
from wsgiref.handlers import format_date_time
from webdriver.common.exceptions import *
from webdriver.common.webserver import SimpleWebServer
import webdriver.remote.webdriver
import webdriver.common_tests
from webdriver.common_tests import utils
from selenium.common.exceptions import *
from selenium.common.webserver import SimpleWebServer
import selenium.remote.webdriver
import selenium.common_tests
from selenium.common_tests import utils

webserver = None
driver = None


def not_available_on_remote(func):
def testMethod(self):
if type(self.driver) == webdriver.remote.webdriver.WebDriver:
if type(self.driver) == selenium.remote.webdriver.WebDriver:
return lambda x: None
else:
return func(self)
Expand Down
6 changes: 3 additions & 3 deletions common/test/py/cookie_tests.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import datetime
import time
import unittest
from webdriver.common.webserver import SimpleWebServer
from webdriver.common_tests import utils
from webdriver.common_tests.utils import require_online
from selenium.common.webserver import SimpleWebServer
from selenium.common_tests import utils
from selenium.common_tests.utils import require_online

webserver = SimpleWebServer()

Expand Down
2 changes: 1 addition & 1 deletion common/test/py/example2.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

import unittest
from google_one_box import GoogleOneBox
from webdriver.firefox.webdriver import WebDriver
from selenium.firefox.webdriver import WebDriver

class ExampleTest2(unittest.TestCase):
"""This example shows how to use the page object pattern.
Expand Down
2 changes: 1 addition & 1 deletion common/test/py/google_one_box.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from webdriver.common.exceptions import *
from selenium.common.exceptions import *
from results_page import ResultsPage
from page_loader import require_loaded
class GoogleOneBox(object):
Expand Down
2 changes: 1 addition & 1 deletion common/test/py/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def run_tests(test_case, driver, webserver):
try:
testLoader = unittest.TestLoader()
testRunner = unittest.TextTestRunner()
test_case_name = "webdriver.common_tests.%s" % test_case
test_case_name = "selenium.common_tests.%s" % test_case
if len(sys.argv) > 1:
testMethod = sys.argv[1]
testRunner.run(
Expand Down
4 changes: 2 additions & 2 deletions firefox/test/py/api_examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@


import logging
from webdriver.common_tests import api_examples
from webdriver.firefox.webdriver import WebDriver
from selenium.common_tests import api_examples
from selenium.firefox.webdriver import WebDriver

if __name__ == "__main__":
api_examples.run_tests(WebDriver())
4 changes: 2 additions & 2 deletions firefox/test/py/cookie_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

#!/usr/bin/python
import logging
from webdriver.common_tests import cookie_tests
from webdriver.firefox.webdriver import WebDriver
from selenium.common_tests import cookie_tests
from selenium.firefox.webdriver import WebDriver

if __name__ == "__main__":
logging.getLogger().setLevel(logging.WARN)
Expand Down
4 changes: 2 additions & 2 deletions firefox/test/py/firefox_launcher_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

import unittest
import logging
from webdriver.firefox.webdriver import FirefoxLauncher
from webdriver.firefox.webdriver import WebDriver
from selenium.firefox.webdriver import FirefoxLauncher
from selenium.firefox.webdriver import WebDriver


class FirefoxLauncherTests (unittest.TestCase):
Expand Down
8 changes: 4 additions & 4 deletions firefox/test/py/profile_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
import tempfile
import time
import unittest
from webdriver.firefox.webdriver import WebDriver
from webdriver.common.webserver import SimpleWebServer
from webdriver.common_tests import utils
from webdriver.firefox.firefox_profile import FirefoxProfile
from selenium.firefox.webdriver import WebDriver
from selenium.common.webserver import SimpleWebServer
from selenium.common_tests import utils
from selenium.firefox.firefox_profile import FirefoxProfile

WEB_SERVER_PORT = 8000
class ProfileTests(unittest.TestCase):
Expand Down

0 comments on commit 0bb4a95

Please sign in to comment.