From d111df4e62f847fbedf85612f1b7cdc729f97c4a Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Sun, 23 Aug 2020 13:48:59 -0400 Subject: [PATCH] uitests: Finish uiutil.py coverage Signed-off-by: Cole Robinson --- tests/uitests/data/keyfile/allstats.ini | 23 +++++++++++++++++++++++ tests/uitests/test_details.py | 2 ++ tests/uitests/test_prefs.py | 4 +--- tests/uitests/utils.py | 1 + 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 tests/uitests/data/keyfile/allstats.ini diff --git a/tests/uitests/data/keyfile/allstats.ini b/tests/uitests/data/keyfile/allstats.ini new file mode 100644 index 000000000..d85dbe827 --- /dev/null +++ b/tests/uitests/data/keyfile/allstats.ini @@ -0,0 +1,23 @@ +[org/virt-manager/virt-manager/vmlist-fields] +disk-usage=true +network-traffic=true + +host-cpu-usage=true +memory-usage=true + +[org/virt-manager/virt-manager/connections] +uris=['test:///default', 'foo:///'] +autoconnect=['test:///default'] + +[org/virt-manager/virt-manager] +manager-window-width=550 +manager-window-height=550 + +[org/virt-manager/virt-manager/new-vm] +graphics-type='system' + +[org/virt-manager/virt-manager/stats] +enable-disk-poll=true +enable-net-poll=true +enable-memory-poll=true +update-interval=1 diff --git a/tests/uitests/test_details.py b/tests/uitests/test_details.py index 491e0fa68..a5e1403a1 100644 --- a/tests/uitests/test_details.py +++ b/tests/uitests/test_details.py @@ -54,9 +54,11 @@ class Details(uiutils.UITestCase): self._testSmokeTest(None) def testDetailsHardwareSmokeTestAlternate(self): + self.app.open(keyfile="allstats.ini") self._testSmokeTest("test alternate devs title") def _testRename(self, origname, newname): + # Enable all stats prefs to hit some extra code win = self._open_details_window(origname) # Ensure the Overview page is the first selected diff --git a/tests/uitests/test_prefs.py b/tests/uitests/test_prefs.py index 8e576ff18..9ca36edee 100644 --- a/tests/uitests/test_prefs.py +++ b/tests/uitests/test_prefs.py @@ -94,9 +94,7 @@ class VMMPrefs(uiutils.UITestCase): """ Preload some keyfile settings and verify they work as expected """ - import os - keyfile = os.path.dirname(__file__) + "/data/keyfile/defaultconn.ini" - self.app.open(use_uri=False, keyfile=keyfile) + self.app.open(use_uri=False, keyfile="defaultconn.ini") managerwin = self.app.topwin # test:///default should be connected diff --git a/tests/uitests/utils.py b/tests/uitests/utils.py index fd43382ac..f2e0714f1 100644 --- a/tests/uitests/utils.py +++ b/tests/uitests/utils.py @@ -479,6 +479,7 @@ class VMMDogtailApp(object): if keyfile: import atexit import tempfile + keyfile = os.path.dirname(__file__) + "/data/keyfile/" + keyfile tempname = tempfile.mktemp(prefix="virtmanager-uitests-keyfile") open(tempname, "w").write(open(keyfile).read()) atexit.register(lambda: os.unlink(tempname))