From 4e6472b018a466740d729c696fb4de0754f328d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Wed, 27 May 2020 13:41:02 +0200
Subject: [PATCH] tests: switch simple http server to python3

Python2 is phased out and not available anymore in some templates.
---
 qubes/tests/integ/dom0_update.py | 2 +-
 qubes/tests/integ/network.py     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qubes/tests/integ/dom0_update.py b/qubes/tests/integ/dom0_update.py
index 4e2ac3cf..19385b59 100644
--- a/qubes/tests/integ/dom0_update.py
+++ b/qubes/tests/integ/dom0_update.py
@@ -194,7 +194,7 @@ Test package
         if self.repo_running:
             return
         self.repo_proc = self.loop.run_until_complete(self.updatevm.run(
-            'cd /tmp/repo && python -m SimpleHTTPServer 8080',
+            'cd /tmp/repo && python3 -m http.server 8080',
             stdout=subprocess.DEVNULL,
             stderr=subprocess.STDOUT))
         self.repo_running = True
diff --git a/qubes/tests/integ/network.py b/qubes/tests/integ/network.py
index 5759e2df..d9aaa3bb 100644
--- a/qubes/tests/integ/network.py
+++ b/qubes/tests/integ/network.py
@@ -1443,12 +1443,12 @@ SHA256:
         if self.template.count("debian") or self.template.count("whonix"):
             self.create_repo_apt()
             self.loop.run_until_complete(self.netvm_repo.run(
-                'cd /tmp/apt-repo && python -m SimpleHTTPServer 8080',
+                'cd /tmp/apt-repo && python3 -m http.server 8080',
                 stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL))
         elif self.template.count("fedora"):
             self.create_repo_yum()
             self.loop.run_until_complete(self.netvm_repo.run(
-                'cd /tmp/yum-repo && python -m SimpleHTTPServer 8080',
+                'cd /tmp/yum-repo && python3 -m http.server 8080',
                 stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL))
         else:
             # not reachable...