Merge pull request #232 from xcp-ng/yumstate-fixture-fix

plugin_updater: fix pkgfixture usage

Author: ydirson

tests/packages/extra/conftest.py

@@ -2,6 +2,12 @@
 import pytest
 import urllib.request
 
+# Explicitly import package-scoped fixtures (see explanation in pkgfixtures.py)
+from pkgfixtures import host_with_saved_yum_state
+# Requirements:
+# From --hosts parameter:
+# - host(A1): any master host of a pool, with access to XCP-ng RPM repositories and reports.xcp-ng.org.
+
 @pytest.fixture(scope="session")
 def extra_pkgs(host):
     version = host.xcp_version_short

tests/packages/extra/test_extra_group_pkgs.py

@@ -1,10 +1,3 @@
-# Explicitly import package-scoped fixtures (see explanation in pkgfixtures.py)
-from pkgfixtures import host_with_saved_yum_state
-
-# Requirements:
-# From --hosts parameter:
-# - host(A1): any master host of a pool, with access to XCP-ng RPM repositories and reports.xcp-ng.org.
-
 def test_extra_group_packages_url_resolved(host, extra_pkgs):
     for p in extra_pkgs:
         host.ssh(['yumdownloader', '--resolve', '--urls', p])

tests/xapi-plugins/plugin_updater/conftest.py

@@ -0,0 +1 @@
+from pkgfixtures import host_with_saved_yum_state

tests/xapi-plugins/plugin_updater/test_updater.py

@@ -1,4 +1,3 @@
-from pkgfixtures import host_with_saved_yum_state
 import json
 
 # Requirements: