Permalink
Browse files

Removing deps.

git-svn-id: http://svn.getwindmill.com/trunk@1382 78c7df6f-8922-0410-bcd3-9426b1ad491b
  • Loading branch information...
1 parent 2855b6f commit f1b6737d6c7d5f832c7ef9276a1716673ff46de7 @mikeal mikeal committed Aug 18, 2009
@@ -38,7 +38,7 @@
if sys.platform != 'win32':
import pwd
import commands
-from mozrunner import killableprocess
+from windmill.dep.mozrunner import killableprocess
import logging
import signal
import exceptions
@@ -39,7 +39,7 @@
if sys.platform != 'win32':
import pwd
import commands
-from mozrunner import killableprocess
+from windmill.dep.mozrunner import killableprocess
import logging
import signal
import exceptions
@@ -40,19 +40,19 @@
if sys.platform != 'win32':
import pwd
import commands
-from mozrunner import killableprocess
import logging
import signal
import exceptions
from StringIO import StringIO
-
from time import sleep
import subprocess
from subprocess import Popen, PIPE, call
from datetime import datetime
from datetime import timedelta
+from windmill.dep.mozrunner import killableprocess
+
logger = logging.getLogger(__name__)
stdout_wrap = StringIO()
View
@@ -1,3 +1,4 @@
+
# Copyright (c) 2006-2007 Open Source Applications Foundation
# Copyright (c) 2008-2009 Mikeal Rogers <mikeal.rogers@gmail.com>
# Copyright (c) 2009 Domen Kozar <domen@dev.si>
@@ -18,7 +19,7 @@
import os, sys
PACKAGE_NAME = "windmill"
-PACKAGE_VERSION = "1.2"
+PACKAGE_VERSION = "1.2.1b4"
SUMMARY = 'Web testing framework intended for complete automation of user interface testing, with strong test debugging and recording capabilities.'
@@ -31,20 +32,9 @@
Thanks for your interest and participation!
"""
-dependencies = ['wsgi_jsonrpc >= 0.2.2',
- 'wsgi_xmlrpc >= 0.2.3',
- 'wsgi_fileserver >= 0.2.3',
- 'functest >= 0.7.1',
- 'mozrunner <= 1.9.9',
- 'simplesettings',
- ]
-
-two_five_dependencies = [ 'simplejson >= 1.7.1',
- ]
-two_four_dependencies = ['uuid', 'ctypes']
+dependencies = []
-if not sys.version.startswith('2.6'):
- dependencies.extend(two_five_dependencies)
+two_four_dependencies = ['ctypes']
if sys.version.startswith('2.4'):
dependencies.extend(two_four_dependencies)
@@ -1,7 +1,7 @@
import sys, os, commands
-import functest
+from windmill.dep import functest
from time import sleep
def test_functest_google_firefox_url():
@@ -1,7 +1,7 @@
import sys, os, commands
-import functest
+from windmill.dep import functest
from time import sleep
def test_functest_google_firefox_url():
@@ -6,7 +6,7 @@
from windmill.bin import admin_lib
import windmill
import os, sys
-import wsgi_fileserver
+from windmill.dep import wsgi_fileserver
def setup_module(module):
windmill.authoring.setup_module(module)
@@ -15,9 +15,9 @@
from windmill.bin import admin_lib
import windmill
import os, sys
-import functest
+from windmill.dep import functest
from time import sleep
-import wsgi_fileserver
+from windmill.dep import wsgi_fileserver
def setup_module(module):
windmill.authoring.setup_module(module)
@@ -1,4 +1,4 @@
-import functest
+from windmill.dep import functest
# Generated by the windmill services transformer
from windmill.authoring import WindmillTestClient
@@ -1,5 +1,5 @@
# Generated by the windmill services transformer
-import functest
+from windmill.dep import functest
from windmill.authoring import WindmillTestClient
def test_recordingSuite0():
@@ -16,7 +16,7 @@
import json as simplejson
except:
import simplejson
-import functest
+from windmill.dep import functest
from datetime import datetime
from windmill.authoring import WindmillTestClient
@@ -587,11 +587,13 @@ windmill/html/js/lib/firebug/pi.js
windmill/html/js/lib/fleegix_js/fleegix.js
windmill/html/js/lib/fleegix_js/fleegix.js.gz
windmill/html/js/lib/fleegix_js/fleegix.js.uncompressed.js
-windmill/html/js/lib/fleegix_js/plugins/hash.js
windmill/html/js/lib/jquery/hoverIntent.js
windmill/html/js/lib/jquery/jquery-1.2.6.pack.js
windmill/html/js/lib/jquery/jquery-1.3.2.min.js
windmill/html/js/lib/jquery/jquery-ui-1.7.2.custom.min.js
+windmill/html/js/lib/jquery/jquery.bgiframe.js
+windmill/html/js/lib/jquery/jquery.dimensions.js
+windmill/html/js/lib/jquery/jquery.tooltip.min.js
windmill/html/js/lib/jquery/superfish.js
windmill/html/js/lib/jquery/ui.progressbar.js
windmill/html/js/wm/events.js

0 comments on commit f1b6737

Please sign in to comment.