Update pytest and dependencies

Author: AutomatedTester

Diff for: py/build.desc

@@ -50,8 +50,8 @@ py_test(
 py_env(
   name = "test_env",
   packages = [
-    "third_party/py/py-1.4.13.tar.gz",
-    "third_party/py/pytest-2.3.4.zip",
+    "third_party/py/py-1.4.26.tar.gz",
+    "third_party/py/pytest-2.7.0.tar.gz",
   ],
   dest = "build/python")
 
@@ -80,7 +80,7 @@ py_docs(
 py_env(
   name = "test_env_docs",
   packages = [
-    "third_party/py/py-1.4.13.tar.gz",
+    "third_party/py/py-1.4.26.tar.gz",
     "third_party/py/docutils-0.11.tar.gz",
     "third_party/py/Jinja2-2.7.tar.gz",
     "third_party/py/MarkupSafe-0.18.tar.gz",

Diff for: rake-tasks/crazy_fun/mappings/python.rb

@@ -152,8 +152,9 @@ def handle(fun, dir, args)
           # Test file pattern has been specified in the pytest.ini file at project root dir
           test_dir = ["#{Python::lib_dir}/selenium/test/selenium/webdriver/#{browser_data[:dir]}/"]
           pytest_args = [pytest_path] + test_dir
-          pytest_args += ["-k", "-ignore_#{browser_data[:ignore]}"] if browser_data[:ignore]
-          pytest_args += ["-k" , ENV['method']] if ENV['method']
+          ignores = "-ignore_#{browser_data[:ignore]}" if browser_data[:ignore]
+          ignores += " and " + ENV['method'] if ENV['method']
+          pytest_args += ["-k=\"" + ignores + "\""]
           pytest_args += ["--junitxml=build/test_logs/python-#{browser}-#{Time.now.to_i}.xml"]
           mkdir_p "build/test_logs"
           sh pytest_args.join(' '), :verbose => true