Skip to content

Commit

Permalink
Minor style fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
rgonalo committed Jul 19, 2016
1 parent fbb0ab2 commit e744c46
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
5 changes: 2 additions & 3 deletions toolium/driver_wrappers_pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import datetime
import inspect
import logging
import os


Expand Down Expand Up @@ -123,8 +122,8 @@ def close_drivers_and_download_videos(cls, name, test_passed=True, maintain_defa
# Stop driver
driver_wrapper.driver.quit()
# Download video if necessary
if (driver_wrapper.config.getboolean_optional('Server', 'video_enabled')
or not test_passed) and driver_wrapper.remote_node_video_enabled:
if (driver_wrapper.config.getboolean_optional('Server', 'video_enabled') or not test_passed) \
and driver_wrapper.remote_node_video_enabled:
driver_wrapper.utils.download_remote_video(driver_wrapper.remote_node, driver_wrapper.session_id,
video_name.format(name, driver_index))
except Exception:
Expand Down
1 change: 1 addition & 0 deletions toolium/test/pageelements/test_derived_page_element.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ def driver_wrapper():

return driver_wrapper


def test_locator(driver_wrapper):
page_object = LoginPageObject(driver_wrapper)

Expand Down
2 changes: 1 addition & 1 deletion toolium/test/pageobjects/examples/android/login.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

from selenium.webdriver.common.by import By

from toolium.pageelements import *
from toolium.pageelements import InputText, Button
from toolium.test.pageobjects.examples.base.login import BaseLoginPageObject


Expand Down
2 changes: 1 addition & 1 deletion toolium/test/pageobjects/examples/ios/login.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

from selenium.webdriver.common.by import By

from toolium.pageelements import *
from toolium.pageelements import InputText, Button
from toolium.test.pageobjects.examples.base.login import BaseLoginPageObject


Expand Down
2 changes: 1 addition & 1 deletion toolium/test/pageobjects/examples/login_one_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

from selenium.webdriver.common.by import By

from toolium.pageelements import *
from toolium.pageelements import InputText, Button
from toolium.pageobjects.mobile_page_object import MobilePageObject


Expand Down
4 changes: 2 additions & 2 deletions toolium/test/test_config_driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -406,13 +406,13 @@ def test_create_remote_driver_capabilities(webdriver_mock, config):
def test_convert_property_type_true(config):
config_driver = ConfigDriver(config)
value = 'True'
assert config_driver._convert_property_type(value) == True
assert config_driver._convert_property_type(value) is True


def test_convert_property_type_false(config):
config_driver = ConfigDriver(config)
value = 'False'
assert config_driver._convert_property_type(value) == False
assert config_driver._convert_property_type(value) is False


def test_convert_property_type_dict(config):
Expand Down
4 changes: 2 additions & 2 deletions toolium/test/test_test_cases.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def logger():

def test_tear_down_pass(logger):
test = run_mock('mock_pass')
assert test._test_passed == True
assert test._test_passed is True

# Check logging messages
init_message = 'Running new test: MockTestClass.mock_pass'
Expand All @@ -75,7 +75,7 @@ def test_tear_down_pass(logger):

def test_tear_down_fail(logger):
test = run_mock('mock_fail')
assert test._test_passed == False
assert test._test_passed is False

# Check logging error messages
init_message = 'Running new test: MockTestClass.mock_fail'
Expand Down
6 changes: 3 additions & 3 deletions toolium/test/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def test_is_remote_video_enabled(utils):
req_mock.get(url, json=config_response_json)

# Get remote video configuration and check result
assert utils.is_remote_video_enabled('10.20.30.40') == True
assert utils.is_remote_video_enabled('10.20.30.40') is True
assert url == req_mock.request_history[0].url


Expand All @@ -190,7 +190,7 @@ def test_is_remote_video_enabled_disabled(utils):
req_mock.get(url, json=config_response_json)

# Get remote video configuration and check result
assert utils.is_remote_video_enabled('10.20.30.40') == False
assert utils.is_remote_video_enabled('10.20.30.40') is False
assert url == req_mock.request_history[0].url


Expand All @@ -200,7 +200,7 @@ def test_is_remote_video_enabled_non_grid_extras(req_get_mock, utils):
req_get_mock.side_effect = ConnectionError('exception error')

# Get remote video configuration and check result
assert utils.is_remote_video_enabled('10.20.30.40') == False
assert utils.is_remote_video_enabled('10.20.30.40') is False


@pytest.mark.parametrize("driver_type, appium_app, appium_browser_name, bar_height", navigation_bar_tests)
Expand Down

0 comments on commit e744c46

Please sign in to comment.