Skip to content
This repository has been archived by the owner on Apr 7, 2022. It is now read-only.

[RFR] Update pytest #9198

Merged
merged 1 commit into from
Nov 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ substitutions:
exclude: ^(cfme|scripts) # for now disable - we shall gradually reenable it
repos:
- repo: https://github.com/asottile/reorder_python_imports
rev: v1.3.5
rev: v1.6.1
hooks:
- id: reorder-python-imports
- repo: https://github.com/ambv/black
rev: 18.9b0
rev: 19.3b0
hooks:
- id: black
args: [--safe, --line-length, '100']
language_version: python3.7
<<: *exclude
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.0.0
rev: v2.3.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand All @@ -27,7 +27,7 @@ repos:
language_version: python3.7
additional_dependencies: [polarion-docstrings, bugzilla-docstrings]
- repo: https://github.com/asottile/pyupgrade
rev: v1.10.1
rev: v1.23.0
hooks:
- id: pyupgrade
language_version: python3.7
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ jobs:
- cp conf/env.yaml.template conf/env.yaml
- cp conf/credentials.yaml.template conf/credentials.yaml
script:
- pytest cfme/utils/tests cfme/modeling/tests requirements -v --dummy-appliance
- pytest -p no:cfme cfme/tests/test_modules_importable.py
- pytest -v --dummy-appliance --collectonly --include-manual
- pytest cfme/utils/tests cfme/modeling/tests requirements --dummy-appliance
- pytest -p no:cfme cfme/tests/test_modules_importable.py --dummy-appliance --long-running
- pytest -v --dummy-appliance --collect-only --include-manual --long-running
after_success:
- coveralls

Expand Down
2 changes: 1 addition & 1 deletion cfme/ansible/credentials.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from widgetastic_patternfly import Input

from cfme.base import Server
from cfme.base.login import BaseLoggedInPage
from cfme.common import BaseLoggedInPage
from cfme.common import Taggable
from cfme.common import TagPageView
from cfme.exceptions import ItemNotFound
Expand Down
2 changes: 1 addition & 1 deletion cfme/ansible/playbooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from widgetastic_patternfly import Dropdown

from cfme.base import Server
from cfme.base.login import BaseLoggedInPage
from cfme.common import BaseLoggedInPage
from cfme.common import Taggable
from cfme.common import TagPageView
from cfme.modeling.base import BaseCollection
Expand Down
2 changes: 1 addition & 1 deletion cfme/ansible/repositories.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from widgetastic_patternfly import Input

from cfme.ansible.playbooks import PlaybooksCollection
from cfme.base.login import BaseLoggedInPage
from cfme.common import BaseLoggedInPage
from cfme.common import Taggable
from cfme.common import TagPageView
from cfme.exceptions import ItemNotFound
Expand Down
2 changes: 1 addition & 1 deletion cfme/ansible_tower/explorer.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from widgetastic_patternfly import Dropdown

from cfme.base import Server
from cfme.base.login import BaseLoggedInPage
from cfme.common import BaseLoggedInPage
from cfme.common import Taggable
from cfme.common import TaggableCollection
from cfme.exceptions import ItemNotFound
Expand Down
2 changes: 1 addition & 1 deletion cfme/ansible_tower/jobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from widgetastic_patternfly import BootstrapNav
from widgetastic_patternfly import Dropdown

from cfme.base.login import BaseLoggedInPage
from cfme.common import BaseLoggedInPage
from cfme.modeling.base import BaseCollection
from cfme.modeling.base import BaseEntity
from cfme.utils.appliance.implementations.ui import CFMENavigateStep
Expand Down
2 changes: 1 addition & 1 deletion cfme/automate/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from widgetastic_patternfly import Input

from cfme.base import Server
from cfme.base.login import BaseLoggedInPage
from cfme.common import BaseLoggedInPage
from cfme.utils.appliance.implementations.ui import CFMENavigateStep
from cfme.utils.appliance.implementations.ui import navigator
from widgetastic_manageiq import Accordion
Expand Down
2 changes: 1 addition & 1 deletion cfme/automate/dialog_import_export.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from widgetastic.widget import View
from widgetastic_patternfly import Button

from cfme.base.login import BaseLoggedInPage
from cfme.common import BaseLoggedInPage
from cfme.utils.appliance import NavigatableMixin
from cfme.utils.appliance.implementations.ui import CFMENavigateStep
from cfme.utils.appliance.implementations.ui import navigate_to
Expand Down
2 changes: 1 addition & 1 deletion cfme/automate/dialogs/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from widgetastic_patternfly import Dropdown
from widgetastic_patternfly import Input

from cfme.base.login import BaseLoggedInPage
from cfme.common import BaseLoggedInPage
from widgetastic_manageiq import Accordion
from widgetastic_manageiq import DialogButton
from widgetastic_manageiq import DialogElement
Expand Down
2 changes: 1 addition & 1 deletion cfme/automate/explorer/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from widgetastic_patternfly import Dropdown

from cfme.base import Server
from cfme.base.login import BaseLoggedInPage
from cfme.common import BaseLoggedInPage
from cfme.utils.appliance.implementations.ui import CFMENavigateStep
from cfme.utils.appliance.implementations.ui import navigator
from widgetastic_manageiq import Accordion
Expand Down
2 changes: 1 addition & 1 deletion cfme/automate/import_export.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from widgetastic_patternfly import FlashMessages
from widgetastic_patternfly import Input

from cfme.base.login import BaseLoggedInPage
from cfme.common import BaseLoggedInPage
from cfme.modeling.base import BaseCollection
from cfme.modeling.base import BaseEntity
from cfme.utils.appliance.implementations.ui import CFMENavigateStep
Expand Down
2 changes: 1 addition & 1 deletion cfme/automate/provisioning_dialogs.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from widgetastic_patternfly import Dropdown

from cfme.automate import AutomateCustomizationView
from cfme.base.login import BaseLoggedInPage
from cfme.common import BaseLoggedInPage
from cfme.modeling.base import BaseCollection
from cfme.modeling.base import BaseEntity
from cfme.utils.appliance.implementations.ui import CFMENavigateStep
Expand Down
129 changes: 0 additions & 129 deletions cfme/base/login.py

This file was deleted.

10 changes: 3 additions & 7 deletions cfme/base/ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from cfme.base import Zone
from cfme.base import ZoneCollection
from cfme.base.credential import Credential
from cfme.base.login import BaseLoggedInPage
from cfme.common import BaseLoggedInPage
from cfme.configure.about import AboutView
from cfme.configure.configuration.server_settings import ServerAuthenticationView
from cfme.configure.configuration.server_settings import ServerInformationView
Expand Down Expand Up @@ -459,9 +459,7 @@ class Dashboard(CFMENavigateStep):
prerequisite = NavigateToSibling('LoggedIn')

def step(self, *args, **kwargs):
self.prerequisite_view.navigation.select(
self.obj.intel_name, "Dashboard"
)
self.prerequisite_view.navigation.select(self.obj.intel_name, "Dashboard")


@navigator.register(Server)
Expand All @@ -470,9 +468,7 @@ class Chargeback(CFMENavigateStep):
prerequisite = NavigateToSibling('LoggedIn')

def step(self, *args, **kwargs):
self.prerequisite_view.navigation.select(
self.obj.intel_name, "Chargeback"
)
self.prerequisite_view.navigation.select(self.obj.intel_name, "Chargeback")


class ServerView(ConfigurationView):
Expand Down
2 changes: 1 addition & 1 deletion cfme/cloud/availability_zone.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from widgetastic_patternfly import Button
from widgetastic_patternfly import Dropdown

from cfme.base.login import BaseLoggedInPage
from cfme.common import BaseLoggedInPage
from cfme.common import CustomButtonEventsMixin
from cfme.common import Taggable
from cfme.common import TimelinesView
Expand Down
2 changes: 1 addition & 1 deletion cfme/cloud/host_aggregates.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from widgetastic_patternfly import BootstrapNav
from widgetastic_patternfly import Dropdown

from cfme.base.login import BaseLoggedInPage
from cfme.common import BaseLoggedInPage
from cfme.modeling.base import BaseCollection
from cfme.modeling.base import BaseEntity
from cfme.utils.appliance.implementations.ui import CFMENavigateStep
Expand Down
2 changes: 1 addition & 1 deletion cfme/cloud/instance/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from widgetastic_patternfly import CheckableBootstrapTreeview
from widgetastic_patternfly import Dropdown

from cfme.base.login import BaseLoggedInPage
from cfme.common import BaseLoggedInPage
from cfme.common import TimelinesView
from cfme.common.vm import VM
from cfme.common.vm import VMCollection
Expand Down
2 changes: 1 addition & 1 deletion cfme/cloud/provider/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
from widgetastic_patternfly import BreadCrumb
from widgetastic_patternfly import Dropdown

from cfme.base.login import BaseLoggedInPage
from cfme.cloud.instance.image import Image
from cfme.cloud.tenant import ProviderTenantAllView
from cfme.common import BaseLoggedInPage
from cfme.common import PolicyProfileAssignable
from cfme.common import Taggable
from cfme.common import TagPageView
Expand Down
Loading