Merge pull request #9198 from mshriver/update-pytest-uncollect

[RFR] Update pytest

.pre-commit-config.yaml

@@ -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
@@ -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

.travis.yml

@@ -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
 

cfme/ansible/credentials.py

@@ -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

cfme/ansible/playbooks.py

@@ -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

cfme/ansible/repositories.py

@@ -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

cfme/ansible_tower/explorer.py

@@ -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

cfme/ansible_tower/jobs.py

@@ -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

cfme/automate/__init__.py

@@ -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

cfme/automate/dialog_import_export.py

@@ -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

cfme/automate/dialogs/__init__.py

@@ -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

cfme/automate/explorer/__init__.py

@@ -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

cfme/automate/import_export.py

@@ -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

cfme/automate/provisioning_dialogs.py

@@ -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

cfme/base/ui.py

@@ -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
@@ -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)
@@ -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):

cfme/cloud/availability_zone.py

@@ -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

cfme/cloud/host_aggregates.py

@@ -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

cfme/cloud/instance/__init__.py

@@ -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

cfme/cloud/provider/__init__.py

@@ -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